[Gnash-commit] gnash ChangeLog macros/ffmpeg.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/10 09:14:48

Modified files:
        .              : ChangeLog 
        macros         : ffmpeg.m4 

Log message:
                * macros/ffmpeg.m4: fix --with-ffmpeg-incl to look for
                  avcodec.h under the 'ffmpeg' subdir (this is assumed
                  to exist in Gnash source code).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2820&r2=1.2821
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2820
retrieving revision 1.2821
diff -u -b -r1.2820 -r1.2821
--- ChangeLog   10 Apr 2007 03:12:04 -0000      1.2820
+++ ChangeLog   10 Apr 2007 09:14:47 -0000      1.2821
@@ -1,3 +1,9 @@
+2007-04-10 Sandro Santilli <address@hidden>
+
+       * macros/ffmpeg.m4: fix --with-ffmpeg-incl to look for
+         avcodec.h under the 'ffmpeg' subdir (this is assumed
+         to exist in Gnash source code).
+
 2007-04-10 Zou Lunkai <address@hidden>
 
        * server/parser/shape_character_def.cpp:

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- macros/ffmpeg.m4    8 Apr 2007 23:06:17 -0000       1.34
+++ macros/ffmpeg.m4    10 Apr 2007 09:14:48 -0000      1.35
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: ffmpeg.m4,v 1.34 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.35 2007/04/10 09:14:48 strk Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -22,10 +22,10 @@
   AC_ARG_WITH(ffmpeg_incl, AC_HELP_STRING([--with-ffmpeg-incl], [directory 
where ffmpeg headers are]), with_ffmpeg_incl=${withval})
   AC_CACHE_VAL(ac_cv_path_ffmpeg_incl,[
     if test x"${with_ffmpeg_incl}" != x ; then
-      if test -f ${with_ffmpeg_incl}/avcodec.h ; then
+      if test -f ${with_ffmpeg_incl}/ffmpeg/avcodec.h ; then
         ac_cv_path_ffmpeg_incl="-I`(cd ${with_ffmpeg_incl}; pwd)`"
       else
-        AC_MSG_ERROR([${with_ffmpeg_incl} directory doesn't contain any 
headers])
+        AC_MSG_ERROR([${with_ffmpeg_incl} directory doesn't contain the 
ffmpeg/avcodec.h header])
       fi
     fi
   ])