Make PKG_CHECK_MODULES tests more user-friendly,

by having them give their errors at the end of the configuration
process instead of stopping it in the middle.  Patch #6116.
Reviewed by Jason Stover.

diff --git a/ChangeLog b/ChangeLog
index ccb1e5b42a99aa634e88a5f8e772e9b987d88464..6329333df6cb24fb28162faf286d7807d85466bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-27  Ben Pfaff  <blp@gnu.org>
+
+       * configure.ac: Make PKG_CHECK_MODULES tests more user-friendly,
+       by having them give their errors at the end of the configuration
+       process instead of stopping it in the middle.  Patch #6116.
+       Reviewed by Jason Stover.
+
 2007-06-14  Ben Pfaff  <blp@gnu.org>
 
        * Smake: Use xmalloca instead of xallocsa due to module renaming.

diff --git a/configure.ac b/configure.ac
index 5bc3e1d133e5e7beec99977b108ac744dccd5e28..022574d152cda5ebbb67ab7f480b24920f94ec0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,8 +36,10 @@ AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
 AC_ARG_WITH(gui, [  --without-gui         don't build the PSPPIRE gui])
 
 if test x"$with_gui" != x"no" ; then 
-       PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)
-       PKG_CHECK_MODULES(GLADE, libglade-2.0)
+  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0,,
+    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.6.0 or later (or use --without-gui)])])
+  PKG_CHECK_MODULES(GLADE, libglade-2.0,,
+    [PSPP_REQUIRED_PREREQ([libglade 2.0 (or use --without-gui)])])
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")