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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Markus Gothe <nihilus>  06/11/04 18:11:09

Modified files:
        .              : ChangeLog 
        macros         : ffmpeg.m4 

Log message:
        Fixing correct linkage...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.76&r2=1.1412.2.77
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.21.2.2&r2=1.21.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.76
retrieving revision 1.1412.2.77
diff -u -b -r1.1412.2.76 -r1.1412.2.77
--- ChangeLog   4 Nov 2006 14:41:09 -0000       1.1412.2.76
+++ ChangeLog   4 Nov 2006 18:11:08 -0000       1.1412.2.77
@@ -20,6 +20,7 @@
        * macros/zlib.h: Fixed typo, corrected output.
        * macros/curl.m4, macros/pkg.m4, macros/libXML.m4: Typo: 
        cross_compling -> cross_compiling.
+       * macros/ffmpeg: Clean-up ups. Fixed correct linking on OBSD.
 
 2006-11-03  Rob Savoye  <address@hidden>
 

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -b -r1.21.2.2 -r1.21.2.3
--- macros/ffmpeg.m4    4 Nov 2006 03:07:25 -0000       1.21.2.2
+++ macros/ffmpeg.m4    4 Nov 2006 18:11:09 -0000       1.21.2.3
@@ -14,14 +14,8 @@
 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  
-dnl 
 
-dnl Ffmpeg modules are:
-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.2.2 2006/11/04 03:07:25 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.21.2.3 2006/11/04 18:11:09 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -116,16 +110,15 @@
       AC_CHECK_LIB(dts, dts_init, 
         [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"],
         [
-        AC_MSG_CHECKING([for libdts library])
         if test -f $topdir/libdts.a -o -f $topdir/libdts.so; then
           ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"
-          AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
         fi
       ])
     else
       ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libdts}"
-      AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
     fi
+       AC_MSG_CHECKING([for libdts library])
+       AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
 
     if test x"$PKG_CONFIG" != x; then
       $PKG_CONFIG --exists libavutil && libavutil=`$PKG_CONFIG --libs 
libavutil`
@@ -137,16 +130,16 @@
       AC_CHECK_LIB(avutil, av_log,
         [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"],
         [
-        AC_MSG_CHECKING([for libavutil library])
         if test -f $topdir/libavutil.a -o -f $topdir/libavutil.so; then
           ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"
-          AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
         fi
       ])
     else
       ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavutil}"
-      AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+
     fi
+       AC_MSG_CHECKING([for libavutil library])
+       AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib}) 
   
     if test x"$PKG_CONFIG" != x; then
       $PKG_CONFIG --exists vorbisenc && vorbisenc=`$PKG_CONFIG --libs 
vorbisenc`
@@ -158,16 +151,15 @@
       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
       ])
     else
       ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${vorbisenc}"
-      AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
     fi
+    AC_MSG_CHECKING([for libvorbisenc library])
+    AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
 
     AC_CHECK_LIB(gsm, gsm_encode, 
       [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"],
@@ -180,7 +172,7 @@
     ])
 
     if test x"$PKG_CONFIG" != x; then
-      $PKG_CONFIG --exists libavformat && libavformat=`$PKG_CONFIG 
--libs-only-l libavformat | cut -f 1 -d ' '`
+      $PKG_CONFIG --exists libavformat && libavformat=`$PKG_CONFIG --libs 
libavformat`
     else
       libavformat=""
     fi
@@ -189,17 +181,17 @@
       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
 
+    AC_MSG_CHECKING([for libavformat library])
+    AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})    
+    
     if test x"$PKG_CONFIG" != x; then
       $PKG_CONFIG --exists theora && libtheora=`$PKG_CONFIG --libs theora`
     else
@@ -210,16 +202,15 @@
       AC_CHECK_LIB(theora, theora_encode_init, 
         [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ltheora"],
         [
-        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})
         fi
       ])
     else
       ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libtheora}"
-      AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
     fi
+     AC_MSG_CHECKING([for libtheora library])
+     AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
 
   fi