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

[Sandro Santilli]

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

Modified files:
        .              : ChangeLog 
        macros         : ffmpeg.m4 

Log message:
        * macros/ffmpeg.m4: don't force linking of libavutil, don't trash 
results of a previosu detection.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1085
retrieving revision 1.1086
diff -u -b -r1.1085 -r1.1086
--- ChangeLog   9 Oct 2006 13:01:28 -0000       1.1085
+++ ChangeLog   9 Oct 2006 13:18:52 -0000       1.1086
@@ -1,5 +1,7 @@
 2006-10-09 Sandro Santilli <address@hidden>
 
+       * 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
          was requested.
 

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- macros/ffmpeg.m4    9 Oct 2006 12:51:59 -0000       1.10
+++ macros/ffmpeg.m4    9 Oct 2006 13:18:52 -0000       1.11
@@ -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.10 2006/10/09 12:51:59 nihilus Exp $
+dnl $Id: ffmpeg.m4,v 1.11 2006/10/09 13:18:52 strk Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -74,7 +74,7 @@
   fi
 
   if test x"${ac_cv_path_ffmpeg_incl}" != x ; then
-    FFMPEG_CFLAGS="${ac_cv_path_ffmpeg_incl}"
+    FFMPEG_CFLAGS="-I${ac_cv_path_ffmpeg_incl}"
     AC_MSG_RESULT(yes)
   else
     FFMPEG_CFLAGS=""
@@ -100,7 +100,7 @@
 
   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 -lavutil"],[
+    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 +111,7 @@
            break
           else
            ac_cv_path_ffmpeg_lib=""
-           FFMPEG_LIBS="-lavcodec -lavutil"
+           FFMPEG_LIBS="-lavcodec"
             AC_MSG_RESULT(yes)
            libn="yes"
            break
@@ -121,23 +121,26 @@
       if test x"$libn" != x"yes"; then
       AC_MSG_RESULT(no)
       fi],
-      [-lavutil])
+      [])
   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 -lavutil"
+       ac_cv_path_ffmpeg_lib="-L${ac_cv_path_ffmpeg_lib} -lavcodec"
       else
         ac_cv_path_ffmpeg_lib=""
-        FFMPEG_LIBS="-lavcodec -lavutil"
+        FFMPEG_LIBS="-lavcodec"
       fi
     fi
   fi
 
-  if test x"${ac_cv_path_ffmpeg_lib}" != x -o x"$libn" = x"yes"; then
-    FFMPEG_LIBS="${ac_cv_path_ffmpeg_lib} -lavcodec -lavutil"
+  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"
+    fi
+  fi
+
+  if test x"$FFMPEG_LIBS" != x; then
     AC_DEFINE([USE_FFMPEG],  [1], [Use FFMPEG for MP3 decoding])
-  else
-    FFMPEG_LIBS=""
   fi
 
   AC_SUBST(FFMPEG_CFLAGS)