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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/21 01:08:23

Modified files:
        macros         : ffmpeg.m4 
        .              : ChangeLog 

Log message:
                * macros/ffmpeg.m4: If we find ffmpeg, it has dependancies on
                other libraries, so find libvorbisenc and libgsm or Gnash won't
                link on Ubuntu with sound enabled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1330&r2=1.1331

Patches:
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- macros/ffmpeg.m4    15 Oct 2006 14:26:05 -0000      1.17
+++ macros/ffmpeg.m4    21 Oct 2006 01:08:23 -0000      1.18
@@ -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.17 2006/10/15 14:26:05 bjacques Exp $
+dnl $Id: ffmpeg.m4,v 1.18 2006/10/21 01:08:23 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -119,6 +119,9 @@
       done
     ])
 
+  fi #}
+
+  if test x"${ac_cv_path_ffmpeg_lib}" != x; then
     AC_CHECK_LIB(avutil, av_log,
       [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"],
       [
@@ -139,7 +142,26 @@
       fi
     ])
 
-  fi #}
+    AC_CHECK_LIB(vorbisenc, vorbis_encode_init, 
+      [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lvorbisenc"],
+      [
+      AC_MSG_CHECKING([for libvorbisenc library])
+      if test -f $topdir/libvorbis.so; then
+        ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lvorbisenc"
+        AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+      fi
+    ])
+
+    AC_CHECK_LIB(gsm, gsm_encode, 
+      [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"],
+      [
+      AC_MSG_CHECKING([for libgsm library])
+      if test -f $topdir/libgsm.so; then
+        ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
+        AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+      fi
+    ])
+  fi
 
 
   if test x"${ac_cv_path_ffmpeg_lib}" != x; then

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1330
retrieving revision 1.1331
diff -u -b -r1.1330 -r1.1331
--- ChangeLog   21 Oct 2006 00:28:49 -0000      1.1330
+++ ChangeLog   21 Oct 2006 01:08:23 -0000      1.1331
@@ -5,6 +5,9 @@
 
 2006-10-20  Rob Savoye  <address@hidden>
 
+       * macros/ffmpeg.m4: If we find ffmpeg, it has dependancies on
+       other libraries, so find libvorbisenc and libgsm or Gnash won't
+       link on Ubuntu with sound enabled.
        * macros/boost.m4: Don't let the boost lib get added to LIBS, we
        want to handle it seperately.