r21534 - gnucash/trunk - Check for guile-2.0 as well as guile-1.8.

Geert Janssens gjanssens at code.gnucash.org
Tue Nov 8 07:31:33 EST 2011


Author: gjanssens
Date: 2011-11-08 07:31:33 -0500 (Tue, 08 Nov 2011)
New Revision: 21534
Trac: http://svn.gnucash.org/trac/changeset/21534

Modified:
   gnucash/trunk/configure.ac
Log:
Check for guile-2.0 as well as guile-1.8.

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2011-11-08 04:49:17 UTC (rev 21533)
+++ gnucash/trunk/configure.ac	2011-11-08 12:31:33 UTC (rev 21534)
@@ -370,12 +370,13 @@
 GUILE_LIBS=""
 
 # Look up GUILE_CFLAGS and GUILE_LIBS, and version check
-PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5], , [AC_MSG_ERROR([
-
-  guile does not appear to be installed correctly, or is not in the
-  correct version range.  Perhaps you have not installed the guile
-  development packages?  Gnucash requires at least version 1.8.5 to build.
-])])
+PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5], , [
+  PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0], , [AC_MSG_ERROR([
+    guile does not appear to be installed correctly, or is not in the
+    correct version range.  Perhaps you have not installed the guile
+    development packages?  Gnucash requires at least version 1.8.5 to build.
+  ])])
+])
 # Look up GUILE executable
 AC_PATH_PROG(GUILE, guile)
 



More information about the gnucash-changes mailing list