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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/09 13:43:57

Modified files:
        .              : ChangeLog 
        macros         : ffmpeg.m4 

Log message:
        * macros/ffmpeg.m4: check for libdts too (required); always run the 
standard AC_CHECK_LIB.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1086&r2=1.1087
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1086
retrieving revision 1.1087
diff -u -b -r1.1086 -r1.1087
--- ChangeLog   9 Oct 2006 13:18:52 -0000       1.1086
+++ ChangeLog   9 Oct 2006 13:43:57 -0000       1.1087
@@ -1,5 +1,7 @@
 2006-10-09 Sandro Santilli <address@hidden>
 
+       * macros/ffmpeg.m4: check for libdts too (required); always run
+         the standard AC_CHECK_LIB.
        * macros/ffmpeg.m4: don't force linking of libavutil, don't trash
          results of a previosu detection.
        * configure.ac: don't check for gstreamer unless gst sound

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- macros/ffmpeg.m4    9 Oct 2006 13:18:52 -0000       1.11
+++ macros/ffmpeg.m4    9 Oct 2006 13:43:57 -0000       1.12
@@ -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.11 2006/10/09 13:18:52 strk Exp $
+dnl $Id: ffmpeg.m4,v 1.12 2006/10/09 13:43:57 strk Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -100,7 +100,6 @@
 
   libn="no"
   if test x"${ac_cv_path_ffmpeg_lib}" = x -a x"$FFMPEG_LIBS" = x ; then
-    AC_CHECK_LIB(avcodec, ff_eval, [FFMPEG_LIBS="-lavcodec"],[
       AC_MSG_CHECKING([for libffmpeg library])
       libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
       for i in $libslist; do
@@ -111,7 +110,7 @@
            break
           else
            ac_cv_path_ffmpeg_lib=""
-           FFMPEG_LIBS="-lavcodec"
+           FFMPEG_LIBS="-lavcodec -ldts"
             AC_MSG_RESULT(yes)
            libn="yes"
            break
@@ -120,12 +119,11 @@
       done
       if test x"$libn" != x"yes"; then
       AC_MSG_RESULT(no)
-      fi],
-      [])
+      fi
   else
     if test -f ${ac_cv_path_ffmpeg_lib}/libavcodec.a -o -f 
${ac_cv_path_ffmpeg_lib}/libavcodec.so; then
       if test x"${ac_cv_path_ffmpeg_lib}" != x"/usr/lib"; then
-       ac_cv_path_ffmpeg_lib="-L${ac_cv_path_ffmpeg_lib} -lavcodec"
+       ac_cv_path_ffmpeg_lib="-L${ac_cv_path_ffmpeg_lib} -lavcodec -ldts"
       else
         ac_cv_path_ffmpeg_lib=""
         FFMPEG_LIBS="-lavcodec"
@@ -135,8 +133,23 @@
 
   if test x"$FFMPEG_LIBS" = x; then
     if x"${ac_cv_path_ffmpeg_lib}" != x -o x"$libn" = x"yes"; then
-      FFMPEG_LIBS="${ac_cv_path_ffmpeg_lib} -lavcodec"
+      FFMPEG_LIBS="${ac_cv_path_ffmpeg_lib} -lavcodec -ldts"
+    fi
     fi
+
+  dnl
+  dnl Call AC_CHECK_LIB here to
+  dnl make sure ffmpeg actually works and we get standard defines
+  dnl
+
+  ac_save_LIBS="$LIBS"
+  LIBS="$LIBS $FFMPEG_LIBS"
+  AC_CHECK_LIB(avcodec, ff_eval, [avcodec_lib_ok="yes"], [avcodec_lib_ok="no"])
+  AC_CHECK_LIB(dts, dts_init, [dts_lib_ok="yes"], [dts_lib_ok="no"])
+  LIBS="$ac_save_LIBS"
+
+  if test x"${avcodec_lib_ok}" = xno -o x"${dts_lib_ok}" = xno; then
+     FFMPEG_LIBS=""
   fi
 
   if test x"$FFMPEG_LIBS" != x; then