[Pspp-cvs] pspp ChangeLog configure.ac

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/07/27 21:33:36

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/pspp/configure.ac?cvsroot=pspp&r1=1.58&r2=1.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- ChangeLog   14 Jun 2007 14:21:23 -0000      1.78
+++ ChangeLog   27 Jul 2007 21:33:35 -0000      1.79
@@ -1,3 +1,10 @@
+2007-07-27  Ben Pfaff  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Smake: Use xmalloca instead of xallocsa due to module renaming.

Index: configure.ac
===================================================================
RCS file: /cvsroot/pspp/pspp/configure.ac,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- configure.ac        4 Apr 2007 00:27:24 -0000       1.58
+++ configure.ac        27 Jul 2007 21:33:36 -0000      1.59
@@ -36,8 +36,10 @@
 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")