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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/07 21:10:20

Modified files:
        .              : ChangeLog 
        macros         : atk.m4 ffmpeg.m4 gstreamer.m4 

Log message:
        Fixed issues with ffmpeg, gstreamer and typos

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1068&r2=1.1069
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gstreamer.m4?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1068
retrieving revision 1.1069
diff -u -b -r1.1068 -r1.1069
--- ChangeLog   7 Oct 2006 19:59:14 -0000       1.1068
+++ ChangeLog   7 Oct 2006 21:10:19 -0000       1.1069
@@ -38,7 +38,9 @@
 2006-10-07 Markus Gothe <address@hidden>
 
        * configure.ac: Fixed typo. '!=' -> '='.
+       * macros/ffmpeg.m4, macros/gstreamer.m4: check if pkg --exists.
        * macros/sdl.m4: Fixed finding libpath.
+       * macros/atk.m4: Typo.
        * plugin/plugin.h: Define __FUNCTION__ and __PRETTY_FUNCTION__ if not.
        * configure.ac: Check and set #SIZEOF_SIZE_T.
 

Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- macros/atk.m4       14 Aug 2006 16:49:38 -0000      1.10
+++ macros/atk.m4       7 Oct 2006 21:10:20 -0000       1.11
@@ -35,6 +35,8 @@
 dnl  
 dnl 
 
+dnl $Id: atk.m4,v 1.11 2006/10/07 21:10:20 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_ATK],
 [
   dnl Look for the header
@@ -154,8 +156,10 @@
 
   if test x"${ac_cv_path_atk_lib}" != x ; then
     ATK_LIBS="${ac_cv_path_atk_lib}"
+    AC_MSG_RESULT(yes)
   else
     ATK_LIBS=""
+    AC_MSG_RESULT(no)
   fi
 
   AC_SUBST(ATK_CFLAGS)

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- macros/ffmpeg.m4    7 Oct 2006 14:20:27 -0000       1.4
+++ macros/ffmpeg.m4    7 Oct 2006 21:10:20 -0000       1.5
@@ -39,6 +39,8 @@
 dnl date-time, filesystem. graph. iostreams, program options, python,
 dnl regex, serialization, signals, unit test, thead, and wave.
 
+dnl $Id: ffmpeg.m4,v 1.5 2006/10/07 21:10:20 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
   dnl Lool for the header
@@ -56,7 +58,7 @@
   ])
 
   pkg=no
-  if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_incl}" = x; then
+  if test x"$PKG_CONFIG --exists libavcodec" = x -a 
x"${ac_cv_path_ffmpeg_incl}" = x; then
     ac_cv_path_ffmpeg_incl=`$PKG_CONFIG --cflags libavcodec`
     pkg=yes
   fi
@@ -75,9 +77,11 @@
 
   if test x"${ac_cv_path_ffmpeg_incl}" != x ; then
     FFMPEG_CFLAGS="${ac_cv_path_ffmpeg_incl}"
+    AC_MSG_RESULT(yes)
+  else
+    FFMPEG_CFLAGS=""
+    AC_MSG_RESULT(no)
   fi
-  AC_SUBST(FFMPEG_CFLAGS)
-
 
   dnl Look for the library
   AC_ARG_WITH(ffmpeg_lib, [  --with-ffmpeg-lib         directory where ffmpeg 
libraries are], with_ffmpeg_lib=${withval})
@@ -92,7 +96,7 @@
   ])
 
   dnl Try with pkg-config
-  if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_lib}" = x; then
+  if test x"$PKG_CONFIG --exists libavcodec" = x -a 
x"${ac_cv_path_ffmpeg_lib}" = x; then
     FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec`
   fi
 
@@ -129,10 +133,13 @@
 
   if test x"${ac_cv_path_ffmpeg_lib}" != x ; then
       FFMPEG_LIBS="${ac_cv_path_ffmpeg_lib} -lavcodec -lavutil"
-  fi
-
   AC_DEFINE([USE_FFMPEG],  [1], [Use FFMPEG for MP3 decoding])
+    AC_MSG_RESULT(yes)
+  else
+    FFMPEG_LIBS=""
+    AC_MSG_RESULT(no)
+  fi
   
+  AC_SUBST(FFMPEG_CFLAGS)  
   AC_SUBST(FFMPEG_LIBS)
-
 ])

Index: macros/gstreamer.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gstreamer.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- macros/gstreamer.m4 27 Jul 2006 14:28:28 -0000      1.15
+++ macros/gstreamer.m4 7 Oct 2006 21:10:20 -0000       1.16
@@ -35,6 +35,8 @@
 dnl  
 dnl 
 
+dnl $Id: gstreamer.m4,v 1.16 2006/10/07 21:10:20 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_GSTREAMER],
 [
     dnl Look for the header
@@ -49,7 +51,7 @@
       fi])
 
     dnl Try with pkg-config
-    if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gstreamer_incl}" = x; then
+    if test x"$PKG_CONFIG --exists gstreamer-0.10" = x -a 
x"${ac_cv_path_gstreamer_incl}" = x; then
       ac_cv_path_gstreamer_incl=`$PKG_CONFIG --cflags gstreamer-0.10`
     fi
 
@@ -100,7 +102,7 @@
       ])
 
     dnl Try with pkg-config
-    if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gstreamer_lib}" = x; then
+    if test x"$PKG_CONFIG --exists gstreamer-0.10" = x -a 
x"${ac_cv_path_gstreamer_lib}" = x; then
       ac_cv_path_gstreamer_lib=`$PKG_CONFIG --libs gstreamer-0.10`
     fi