From: David Kastrup <dak@gnu.org>
Date: Wed, 14 Aug 2013 18:43:37 +0000 (+0200)
Subject: Issue 4126: Provide a --enable-guile2 option in configure
X-Git-Tag: release/2.19.15-1~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=414804cfb0f79dd0e591b3a3e2d2255461618a10;p=lilypond.git

Issue 4126: Provide a --enable-guile2 option in configure

For convenient experimenting with GUILEv2, we want to have everything in
master, so provide a configure option that will allow the switch to
GUILEv2 compilation.  Off by default since, well, lots of stuff does not
work yet.
---

diff --git a/aclocal.m4 b/aclocal.m4
index c9f0093381..74cf3bcb2c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -674,7 +674,7 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
 	AC_MSG_RESULT([$ver])
 	GUILE_CONFIG=$found
     else
-	STEPMAKE_ADD_ENTRY($1, "$guile_config (guile-devel, guile-dev or libguile-dev package) or guile1-config (guile1-devel package)")
+	STEPMAKE_ADD_ENTRY($1, "$guile_config (guile-devel, guile-dev or libguile-dev package)")
     fi
 
     AC_SUBST(GUILE_CONFIG)
diff --git a/configure.ac b/configure.ac
index 008befe4ec..f7402372ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,12 @@ AC_ARG_ENABLE(documentation,
     [DOCUMENTATION=$enableval])
 AC_SUBST(DOCUMENTATION)
 
+GUILEv2=no
+AC_ARG_ENABLE(guile2,
+    [AS_HELP_STRING([--enable-guile2],
+		    [highly experimental GUILE 2 support.  Default: off])],
+    [GUILEv2=$enableval])
+
 AC_ARG_WITH(ncsb-dir,
     [AS_HELP_STRING([--with-ncsb-dir=DIR],
 		    [location of Century Schoolbook fonts.])],
@@ -129,7 +135,12 @@ STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS(REQUIRED)
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2, 1.9.0)
+if test "$GUILEv2" = "yes"
+then
+    STEPMAKE_GUILE_DEVEL(REQUIRED, 2.0.7, 2.2.0)
+else
+    STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2, 1.9.0)
+fi
 
 # check for 3 typedefs added in Guile 1.9
 save_CXXFLAGS="$CXXFLAGS"