[Gnash-commit] /srv/bzr/gnash/trunk r11945: Fix detection of pkg-config --cflags & --libs

[Markus Gothe]

------------------------------------------------------------
revno: 11945
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Sun 2010-02-14 18:04:51 +0100
message:
  Fix detection of pkg-config --cflags & --libs
modified:
  macros/gnashpkgtool.m4

=== modified file 'macros/gnashpkgtool.m4'
--- a/macros/gnashpkgtool.m4    2010-02-05 02:09:41 +0000
+++ b/macros/gnashpkgtool.m4    2010-02-14 17:04:51 +0000
@@ -61,7 +61,9 @@
   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 [lib]DASHDOWN && ac_cv_path_$1_incl="`$PKG_CONFIG 
--cflags [lib]DASHDOWN`"
       $PKG_CONFIG --exists DASHDOWN[] && ac_cv_path_$1_incl="`$PKG_CONFIG 
--cflags DASHDOWN[]`"
+      $PKG_CONFIG --exists lib$name && ac_cv_path_$1_incl="`$PKG_CONFIG 
--cflags lib$name`"
       $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})
@@ -175,16 +177,16 @@
   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 [lib]DASHDOWN && ac_cv_path_$1_lib="`$PKG_CONFIG 
--libs-only-l [lib]DASHDOWN`"
-      $PKG_CONFIG --exists DASHDOWN && ac_cv_path_$1_lib="`$PKG_CONFIG 
--libs-only-l DASHDOWN`"
-      $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`"
-      dnl AC_MSG_CHECKING([for lib$1 library])
+      AC_MSG_CHECKING([for lib$1 library using pkg-config])
+      $PKG_CONFIG --exists [lib]DASHDOWN && ac_cv_path_$1_lib="`$PKG_CONFIG 
--libs [lib]DASHDOWN`"
+      $PKG_CONFIG --exists DASHDOWN && ac_cv_path_$1_lib="`$PKG_CONFIG --libs 
DASHDOWN`"
+      $PKG_CONFIG --exists lib$name && ac_cv_path_$1_lib="`$PKG_CONFIG --libs 
lib$name`"
+      $PKG_CONFIG --exists $name && ac_cv_path_$1_lib="`$PKG_CONFIG --libs 
$name`"
       if test x"${ac_cv_path_$1_lib}" != x; then
-        dnl AC_MSG_RESULT(${ac_cv_path_$1_lib})
+        AC_MSG_RESULT(${ac_cv_path_$1_lib})
         ac_manual=no
-      dnl else
-        dnl AC_MSG_RESULT([not found])
+      else
+        AC_MSG_RESULT([not found])
       fi
     fi
     if test x"${ac_cv_path_$1_lib}" = x; then