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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/09 12:20:19

Modified files:
        macros         : ffmpeg.m4 gstreamer.m4 

Log message:
        Reverted '...--exists = x' and misc. fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gstreamer.m4?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ffmpeg.m4   9 Oct 2006 04:39:06 -0000       1.7
+++ ffmpeg.m4   9 Oct 2006 12:20:19 -0000       1.8
@@ -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.7 2006/10/09 04:39:06 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.8 2006/10/09 12:20:19 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -58,8 +58,8 @@
   ])
 
   pkg=no
-  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`
+  if test x"$PKG_CONFIG" = x -a x"${ac_cv_path_ffmpeg_incl}" = x; then
+   `$PKG_CONFIG --exists libavcodec` && ac_cv_path_ffmpeg_incl=`$PKG_CONFIG 
--cflags libavcodec`
     pkg=yes
   fi
 
@@ -96,8 +96,8 @@
   ])
 
   dnl Try with pkg-config
-  if test x"$PKG_CONFIG --exists libavcodec" = x -a 
x"${ac_cv_path_ffmpeg_lib}" = x; then
-    FFMPEG_LIBS=`$PKG_CONFIG --libs libavcodec`
+  if test x"$PKG_CONFIG" = x -a x"${ac_cv_path_ffmpeg_lib}" = x; then
+    `$PKG_CONFIG --exists libavcodec` && FFMPEG_LIBS=`$PKG_CONFIG --libs 
libavcodec`
   fi
 
   libn="no"

Index: gstreamer.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gstreamer.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gstreamer.m4        9 Oct 2006 04:39:06 -0000       1.17
+++ gstreamer.m4        9 Oct 2006 12:20:19 -0000       1.18
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: gstreamer.m4,v 1.17 2006/10/09 04:39:06 rsavoye Exp $
+dnl $Id: gstreamer.m4,v 1.18 2006/10/09 12:20:19 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_GSTREAMER],
 [
@@ -51,8 +51,8 @@
       fi])
 
     dnl Try with pkg-config
-    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`
+    if test x"$PKG_CONFIG" = x -a x"${ac_cv_path_gstreamer_incl}" = x; then
+      `$PKG_CONFIG --exists gstreamer-0.10` && 
ac_cv_path_gstreamer_incl=`$PKG_CONFIG --cflags gstreamer-0.10`
     fi
 
     dnl If the path hasn't been specified, go look for it.
@@ -102,8 +102,8 @@
       ])
 
     dnl Try with pkg-config
-    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`
+    if test x"$PKG_CONFIG" = x -a x"${ac_cv_path_gstreamer_lib}" = x; then
+       `$PKG_CONFIG --exists gstreamer-0.10` && 
ac_cv_path_gstreamer_lib=`$PKG_CONFIG --libs gstreamer-0.10`
     fi
 
     dnl If the path hasn't been specified, go look for it.