From: Thomas Morley <thomasmorley65@gmail.com>
Date: Sun, 19 Mar 2017 13:29:04 +0000 (+0100)
Subject: Issue 5108 Let configure find all needed files with guile-2.2
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=e9ae1cb3b093498ccb9d5f7348c755a3243bbccc;p=lilypond.git

Issue 5108 Let configure find all needed files with guile-2.2

in configure.ac
Adds support for STEPMAKE_GUILE
Update guile-versions for STEPMAKE_GUILE and STEPMAKE_GUILE_DEVEL

in aclocal.m4
update the list to search for guile-config

Many thanks to Antonio Ospite
---

diff --git a/aclocal.m4 b/aclocal.m4
index ed47b8350e..bd41673d66 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -658,7 +658,12 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
     AC_MSG_CHECKING([for guile-config])
     guile_config="guile-config"
     found="no"
-    for r in $GUILE_CONFIG $target_guile_config $host_guile_config $build_guile_config guile-config guile2-config guile2.0-config guile-2.0-config guile1-config guile1.9-config guile1.8-config guile-1-config guile-1.9-config guile-1.8-config; do
+    for r in $GUILE_CONFIG \
+      $target_guile_config $host_guile_config $build_guile_config \
+      guile-config guile-2.2-config guile2.2-config guile2-config \
+      guile2.0-config guile-2.0-config guile1-config guile1.9-config \
+      guile1.8-config guile-1-config guile-1.9-config guile-1.8-config; \
+      do
 	exe=`STEPMAKE_GET_EXECUTABLE($r)`
 	if ! $exe --version > /dev/null 2>&1 ; then
 	    continue
diff --git a/configure.ac b/configure.ac
index d77ea15881..8f2f61abf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,7 +181,7 @@ STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS(REQUIRED)
 if test "$GUILEv2" = "yes"
 then
-    STEPMAKE_GUILE_DEVEL(REQUIRED, 2.0.7, 2.2.0)
+    STEPMAKE_GUILE_DEVEL(REQUIRED, 2.0.7, 2.3.0)
 else
     STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2, 1.9.0)
 fi
@@ -267,7 +267,12 @@ STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
 STEPMAKE_WINDOWS
 
 # guile executable for some scripts
-STEPMAKE_GUILE(OPTIONAL, 1.8.2, 1.9.0)
+if test "$GUILEv2" = "yes"
+then
+    STEPMAKE_GUILE(OPTIONAL, 2.0.7, 2.3.0)
+else
+    STEPMAKE_GUILE(OPTIONAL, 1.8.2, 1.9.0)
+fi
 
 # perl for help2man and for mf2pt1.pl
 STEPMAKE_PERL(REQUIRED)