From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Tue, 4 Apr 2017 14:09:41 +0000 (+0900)
Subject: Issue 5115: Add guile-config-1.8 etc. searching
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=42952dd74fdb084ed0101ebf528ea0263277a902;p=lilypond.git

Issue 5115: Add guile-config-1.8 etc. searching

LilyPond's configure script did not search guile-config-1.8.
Unfortunately, Cygwin's libguile1.8-devel package has guile-config-1.8.
So the configure script cannot find it.

This commit adds guile-config-1.8 etc. searching.
And, it also modifies the searching order.
---

diff --git a/aclocal.m4 b/aclocal.m4
index bd41673d66..b15111dd0c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -660,9 +660,13 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
     found="no"
     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; \
+      guile-config \
+      guile2-config   guile-2-config   guile-config-2   \
+      guile2.2-config guile-2.2-config guile-config-2.2 \
+      guile2.0-config guile-2.0-config guile-config-2.0 \
+      guile1-config   guile-1-config   guile-config-1   \
+      guile1.9-config guile-1.9-config guile-config-1.9 \
+      guile1.8-config guile-1.8-config guile-config-1.8; \
       do
 	exe=`STEPMAKE_GET_EXECUTABLE($r)`
 	if ! $exe --version > /dev/null 2>&1 ; then