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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/09 16:11:27

Modified files:
        macros         : ffmpeg.m4 pango.m4 

Log message:
        '= x' -> '!= x'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ffmpeg.m4   9 Oct 2006 13:43:57 -0000       1.12
+++ ffmpeg.m4   9 Oct 2006 16:11:27 -0000       1.13
@@ -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.12 2006/10/09 13:43:57 strk Exp $
+dnl $Id: ffmpeg.m4,v 1.13 2006/10/09 16:11:27 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -57,7 +57,7 @@
   fi
   ])
 
-  if test x"$PKG_CONFIG" = x -a x"${ac_cv_path_ffmpeg_incl}" = x; then
+  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`
   fi
 
@@ -94,7 +94,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" != x -a x"${ac_cv_path_ffmpeg_lib}" = x; then
     $PKG_CONFIG --exists libavcodec && FFMPEG_LIBS=`$PKG_CONFIG --libs 
libavcodec`
   fi
 

Index: pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- pango.m4    9 Oct 2006 04:39:06 -0000       1.16
+++ pango.m4    9 Oct 2006 16:11:27 -0000       1.17
@@ -35,6 +35,8 @@
 dnl  
 dnl 
 
+dnl $Id: pango.m4,v 1.17 2006/10/09 16:11:27 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_PANGO],
 [
     dnl Look for the header
@@ -50,7 +52,7 @@
   ])
 
   if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_incl}" = x; then
-    ac_cv_path_pango_incl=`$PKG_CONFIG --cflags pango`
+    $PKG_CONFIG --exists pango && ac_cv_path_pango_incl=`$PKG_CONFIG --cflags 
pango`
   fi
 
   dnl Attempt to find the top level directory, which unfortunately has a
@@ -100,8 +102,7 @@
      else
         AC_MSG_RESULT(no)
      fi
-      fi
-    ])
+    fi])
   fi
 
   dnl Look for the library
@@ -123,7 +124,7 @@
   dnl dependancy problem without breaking anything else, or requiring
   dnl a hugly complex configure test.
   if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_lib}" = x; then
-    ac_cv_path_pango_lib=`$PKG_CONFIG --libs pango`
+     $PKG_CONFIG --exists pango && ac_cv_path_pango_lib=`$PKG_CONFIG --libs 
pango`
     if test x"$gnash_pango_version" = x; then
        gnash_pango_version=`echo ${ac_cv_path_pango_lib} | cut -f 1 -d ' ' | 
sed -e 's/-lpango-//'`
     fi