[Gnash-commit] gnash/macros gnashpkgtool.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/11/30 13:52:07

Modified files:
        macros         : gnashpkgtool.m4 

Log message:
        Bugfixing...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- gnashpkgtool.m4     24 Nov 2007 16:47:10 -0000      1.45
+++ gnashpkgtool.m4     30 Nov 2007 13:52:07 -0000      1.46
@@ -14,7 +14,7 @@
 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 $Id: gnashpkgtool.m4,v 1.45 2007/11/24 16:47:10 rsavoye Exp $
+dnl $Id: gnashpkgtool.m4,v 1.46 2007/11/30 13:52:07 nihilus Exp $
 
 dnl Generic macros for finding and setting include-paths and library-path
 dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
@@ -65,10 +65,8 @@
   if test x$cross_compiling = xno; then
          if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_incl}" = x; then
            AC_MSG_CHECKING([for $2 header using pkg-config])
-           $PKG_CONFIG --exists libDOWN[] && ac_cv_path_$1_lib=`$PKG_CONFIG 
--cflags libDOWN[]`
-           $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_incl=`$PKG_CONFIG 
--cflags DOWN[]`
-           $PKG_CONFIG --exists lib$name && ac_cv_path_$1_lib=`$PKG_CONFIG 
--cflags lib$name`
-           $PKG_CONFIG --exists $name && ac_cv_path_$1_incl=`$PKG_CONFIG 
--cflags $name`
+           $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_incl="`$PKG_CONFIG 
--cflags DOWN[]`"
+           $PKG_CONFIG --exists $name && ac_cv_path_$1_incl="`$PKG_CONFIG 
--cflags $name`"
            if test x"${ac_cv_path_$1_incl}" != x; then
              AC_MSG_RESULT(${ac_cv_path_$1_incl})
              found_$1_incl="yes"
@@ -178,10 +176,10 @@
        dnl If the header doesn't exist, there is no point looking for the 
library.
   if test x$cross_compiling = xno; then
          if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_lib}" = x; then
-                 $PKG_CONFIG --exists libDOWN[] && 
ac_cv_path_$1_lib=`$PKG_CONFIG --libs-only-l libDOWN[]`
-                 $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_lib=`$PKG_CONFIG 
--libs-only-l DOWN[]`
-                 $PKG_CONFIG --exists lib$name && 
ac_cv_path_$1_lib=`$PKG_CONFIG --libs-only-l lib$name`
-                 $PKG_CONFIG --exists $name && ac_cv_path_$1_lib=`$PKG_CONFIG 
--libs-only-l $name`
+                 $PKG_CONFIG --exists libDOWN[] && 
ac_cv_path_$1_lib="`$PKG_CONFIG --libs-only-l libDOWN[]`"
+                 $PKG_CONFIG --exists DOWN[] && 
ac_cv_path_$1_lib="`$PKG_CONFIG --libs-only-l DOWN[]`"
+                 $PKG_CONFIG --exists lib$name && 
ac_cv_path_$1_lib="`$PKG_CONFIG --libs-only-l lib$name`"
+                 $PKG_CONFIG --exists $name && ac_cv_path_$1_lib="`$PKG_CONFIG 
--libs-only-l $name`"
                  AC_MSG_CHECKING([for lib$1 library])      
                  AC_MSG_RESULT(${ac_cv_path_$1_lib})
          fi