From: Ben Pfaff <blp@gnu.org>
Date: Fri, 27 Jul 2007 21:33:35 +0000 (+0000)
Subject: Make PKG_CHECK_MODULES tests more user-friendly,
X-Git-Tag: v0.6.0~346
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=3d4d87faafee668d269b5345966b89b21c66d279

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 ccb1e5b4..6329333d 100644
--- 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 5bc3e1d1..022574d1 100644
--- 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")