Commit e3141fcf authored by Paul Eggert's avatar Paul Eggert
Browse files

* 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.
parent 2f294edf
2012-09-14 Paul Eggert <eggert@cs.ucla.edu>
* 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 <jan.h.d@swipnet.se> 2012-09-13 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac: Reorder Xaw3d messages. * configure.ac: Reorder Xaw3d messages.
......
...@@ -1189,9 +1189,10 @@ AC_DEFUN([PKG_CHECK_MODULES], [ ...@@ -1189,9 +1189,10 @@ AC_DEFUN([PKG_CHECK_MODULES], [
$1_CFLAGS="" $1_CFLAGS=""
$1_LIBS="" $1_LIBS=""
## If we have a custom action on failure, don't print errors, but ## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so. ## do set a variable so people can do so. Do it in a subshell
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ## to capture any diagnostics in invoking pkg-config.
ifelse([$4], ,echo $$1_PKG_ERRORS,) $1_PKG_ERRORS=`($PKG_CONFIG --print-errors "$2") 2>&1`
ifelse([$4], ,echo "$$1_PKG_ERRORS",)
fi fi
AC_SUBST($1_CFLAGS) AC_SUBST($1_CFLAGS)
...@@ -1934,10 +1935,10 @@ if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then ...@@ -1934,10 +1935,10 @@ if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then
dnl Checks for libraries. dnl Checks for libraries.
PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no) PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no)
if test "$pkg_check_gtk" = "no"; then if test "$pkg_check_gtk" = "no" &&
if test "$USE_X_TOOLKIT" = "maybe" || test "$with_gtk" = "yes" || test "$with_gtk2" = "yes"; then { test "$with_gtk" = yes || test "$with_gtk2" = "yes"; }
AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS) then
fi AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS)
fi fi
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment