X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.ac;h=f7402372ef8fdbeaa2f8a21d1135adc49580615c;hb=8d79501773810429b8294c7a2234884775b12600;hp=3922dd15277d20452e952b6f4f8e75a74d223b57;hpb=49252ba6db660cc960f6646cc8fdda0f53ab98c3;p=lilypond.git

diff --git a/configure.ac b/configure.ac
index 3922dd1527..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.])],
@@ -120,7 +126,7 @@ STEPMAKE_LIB(REQUIRED)
 STEPMAKE_DLOPEN
 # Do not use bison 1.50 and 1.75.
 # 1.29 is required fr %locations, but I'm not sure it's enough --ns
-STEPMAKE_BISON(OPTIONAL, 1.29)
+STEPMAKE_BISON(REQUIRED, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
 STEPMAKE_FLEXLEXER_LOCATION
@@ -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"