guile1-config

[Werner LEMBERG]

Folks,


openSuSE is now packaging guile 1 and guile 2 separately, and the
former comes with a `guile1-config' script, and the binary is called
`guile1'.

Given that lilypond doesn't work reliably with guile 2 yet (at least I
got a segfault during `make all') it might be a good thing to make it
work for the above configuration also...

Attached is a very primitive patch which works for me.


    Werner

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index c60521e..b92ddf8 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -536,6 +536,10 @@ AC_DEFUN(STEPMAKE_GETTEXT, [
 
 AC_DEFUN(STEPMAKE_GUILE, [
     STEPMAKE_PATH_PROG(GUILE, guile, $1)
+    if test "$GUILE" = "- echo guile not found"; then
+      GUILE=
+      STEPMAKE_PATH_PROG(GUILE, guile1, $1)
+    fi
 ])
 
 
@@ -577,7 +581,7 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
     test -n "$target_alias" && target_guile_config=$target_alias-guile-config
     test -n "$host_alias" && host_guile_config=$host_alias-guile-config
     AC_MSG_CHECKING([for guile-config])
-    for guile_config in $GUILE_CONFIG $target_guile_config $host_guile_config 
$build_guile_config guile-config; do
+    for guile_config in $GUILE_CONFIG $target_guile_config $host_guile_config 
$build_guile_config guile-config guile1-config; do
        AC_MSG_RESULT([$guile_config])
        if ! $guile_config --version > /dev/null 2>&1 ; then
            AC_MSG_WARN([cannot execute $guile_config])