[Emacs-diffs] /srv/bzr/emacs/trunk r110029: * configure.ac: Port to hosts lacking gtk.

[Paul Eggert]

------------------------------------------------------------
revno: 110029
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2012-09-14 11:56:19 -0700
message:
  * configure.ac: Port to hosts lacking gtk.
  
  (PKG_CHECK_MODULES): Capture pkg-config diagnostics
  better, in particular, problems in invoking pkg-config itself.
  This is useful on hosts that don't have pkg-config.
  (GTK_MODULES): Do not exit 'configure' simply because gtk3
  and gtk2 are both missing.  Problem found on Solaris 8.
modified:
  ChangeLog
  configure.ac

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-13 12:02:00 +0000
+++ b/ChangeLog 2012-09-14 18:56:19 +0000
@@ -1,3 +1,12 @@
+2012-09-14  Paul Eggert  <address@hidden>
+
+       * configure.ac: Port to hosts lacking gtk.
+       (PKG_CHECK_MODULES): Capture pkg-config diagnostics
+       better, in particular, problems in invoking pkg-config itself.
+       This is useful on hosts that don't have pkg-config.
+       (GTK_MODULES): Do not exit 'configure' simply because gtk3
+       and gtk2 are both missing.  Problem found on Solaris 8.
+
 2012-09-13  Jan Djärv  <address@hidden>
 
        * configure.ac: Reorder Xaw3d messages.

=== modified file 'configure.ac'
--- a/configure.ac      2012-09-13 12:02:00 +0000
+++ b/configure.ac      2012-09-14 18:56:19 +0000
@@ -1189,9 +1189,10 @@
             $1_CFLAGS=""
             $1_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+           ## do set a variable so people can do so.  Do it in a subshell
+           ## to capture any diagnostics in invoking pkg-config.
+           $1_PKG_ERRORS=`($PKG_CONFIG --print-errors "$2") 2>&1`
+           ifelse([$4], ,echo "$$1_PKG_ERRORS",)
         fi
 
         AC_SUBST($1_CFLAGS)
@@ -1934,10 +1935,10 @@
 
   dnl Checks for libraries.
   PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no)
-  if test "$pkg_check_gtk" = "no"; then
-     if test "$USE_X_TOOLKIT" = "maybe" || test "$with_gtk" = "yes" || test 
"$with_gtk2" = "yes"; then
-       AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS)
-     fi
+  if test "$pkg_check_gtk" = "no" &&
+     { test "$with_gtk" = yes || test "$with_gtk2" = "yes"; }
+  then
+    AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS)
   fi
 fi