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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/28 17:58:43

Modified files:
        macros         : ffmpeg.m4 
        .              : ChangeLog 

Log message:
                * macros/ffmpeg.m4: Also look for libavformat, which is needed 
on
                some systems to support the new video code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1432&r2=1.1433

Patches:
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- macros/ffmpeg.m4    21 Oct 2006 10:11:49 -0000      1.21
+++ macros/ffmpeg.m4    28 Oct 2006 17:58:43 -0000      1.22
@@ -39,7 +39,7 @@
 dnl date-time, filesystem. graph. iostreams, program options, python,
 dnl regex, serialization, signals, unit test, thead, and wave.
 
-dnl $Id: ffmpeg.m4,v 1.21 2006/10/21 10:11:49 nihilus Exp $
+dnl $Id: ffmpeg.m4,v 1.22 2006/10/28 17:58:43 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -198,6 +198,27 @@
     ])
 
     if test x"$PKG_CONFIG" != x; then
+      $PKG_CONFIG --exists libavformat && libavformat=`$PKG_CONFIG 
--libs-only-l libavformat | cut -f 1 -d ' '`
+    else
+      libavformat=""
+    fi
+
+    if test x"${libavformat}" = x; then
+      AC_CHECK_LIB(libavformat, av_open_input_file, 
+        [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavformat"],
+        [
+        AC_MSG_CHECKING([for libavformat library])
+        if test -f $topdir/libavformat.so; then
+          ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavformat"
+          AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+        fi
+      ])
+    else
+      ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavformat}"
+      AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+    fi
+
+    if test x"$PKG_CONFIG" != x; then
       $PKG_CONFIG --exists theora && libtheora=`$PKG_CONFIG --libs theora`
     else
       libtheora=""
@@ -207,7 +228,7 @@
       AC_CHECK_LIB(theora, theora_encode_init, 
         [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ltheora"],
         [
-        AC_MSG_CHECKING([for libvorbisenc library])
+        AC_MSG_CHECKING([for libtheora library])
         if test -f $topdir/libtheora.so; then
           ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ltheora"
           AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1432
retrieving revision 1.1433
diff -u -b -r1.1432 -r1.1433
--- ChangeLog   28 Oct 2006 11:41:10 -0000      1.1432
+++ ChangeLog   28 Oct 2006 17:58:43 -0000      1.1433
@@ -1,3 +1,8 @@
+2006-10-28  Rob Savoye  <address@hidden>
+
+       * macros/ffmpeg.m4: Also look for libavformat, which is needed on
+       some systems to support the new video code.
+
 2006-10-28 Udo Giacomozzi <address@hidden>
 
        * backend/render_handler_agg.cpp: added bogus YUV_video to make