[Emacs-diffs] /srv/bzr/emacs/trunk r107794: Check pkg-config exit status when configuring (Bug#10626).

[Paul Eggert]

------------------------------------------------------------
revno: 107794
fixes bug(s): http://debbugs.gnu.org/10626
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2012-04-07 13:45:36 -0700
message:
  Check pkg-config exit status when configuring (Bug#10626).
  
  * configure.in (PKG_CHECK_MODULES): Do not assume that pkg-config
  works; check its exit status.  Problem reported by Jordi Gutiérrez
  Hermoso in
  <http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00787.html>.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-04-07 20:00:16 +0000
+++ b/ChangeLog 2012-04-07 20:45:36 +0000
@@ -1,3 +1,11 @@
+2012-04-07  Paul Eggert  <address@hidden>
+
+       Check pkg-config exit status when configuring (Bug#10626).
+       * configure.in (PKG_CHECK_MODULES): Do not assume that pkg-config
+       works; check its exit status.  Problem reported by Jordi Gutiérrez
+       Hermoso in
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00787.html>.
+
 2012-04-07  Glenn Morris  <address@hidden>
 
        * README, configure.in (AC_INIT): Bump version to 24.1.50.

=== modified file 'configure.in'
--- a/configure.in      2012-04-07 20:00:16 +0000
+++ b/configure.in      2012-04-07 20:45:36 +0000
@@ -1124,17 +1124,14 @@
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
         AC_MSG_CHECKING(for $2)
 
-        if $PKG_CONFIG --exists "$2" 2>&AS_MESSAGE_LOG_FD; then
-            AC_MSG_RESULT(yes)
+        if $PKG_CONFIG --exists "$2" 2>&AS_MESSAGE_LOG_FD &&
+          $1_CFLAGS=`$PKG_CONFIG --cflags "$2" 2>&AS_MESSAGE_LOG_FD` &&
+          $1_LIBS=`$PKG_CONFIG --libs "$2" 2>&AS_MESSAGE_LOG_FD`; then
+
+           $1_CFLAGS=`AS_ECHO(["$$1_CFLAGS"]) | sed -e 's,///*,/,g'`
+           $1_LIBS=`AS_ECHO(["$$1_LIBS"]) | sed -e 's,///*,/,g'`
+            AC_MSG_RESULT([yes CFLAGS='$$1_CFLAGS' LIBS='$$1_LIBS'])
             succeeded=yes
-
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"|sed -e 's,///*,/,g'`
-            AC_MSG_RESULT($$1_CFLAGS)
-
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"|sed -e 's,///*,/,g'`
-            AC_MSG_RESULT($$1_LIBS)
         else
             AC_MSG_RESULT(no)
             $1_CFLAGS=""