patch::: 1.3.106.jcn2

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index d1220794a6556252cd1e021bd4316df0149ef426..724a91b40b7265b18cf05aa870ad088ec47310a6 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -76,6 +76,7 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
 
     CFLAGS="$CFLAGS $OPTIMIZE"
     CPPFLAGS=${CPPFLAGS:-""}
+    AC_SUBST(cross_compiling)
     AC_SUBST(CFLAGS)
     AC_SUBST(CPPFLAGS)
     AC_SUBST(LDFLAGS)
@@ -177,9 +178,15 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
     fi
     AC_MSG_CHECKING("Guile version")
     need_guile_version="1.3.4"
-    guile_version=`expr "\`$guile_config --version 2>&1\`" : ".*\($need_guile_version\).*"`
+    need_guile_version_numeric=100304
+    guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'`
+    guile_version_numeric=`echo $guile_version | awk -F. '
+{if ([$]3) {last = [$]3}
+else {last =0}}
+{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'`
     AC_MSG_RESULT("$guile_version")
-    if test "$guile_version" != "$need_guile_version"; then
+    if test $guile_version_numeric -lt $need_guile_version_numeric
+    then
         AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed")
     fi
     GUILE_FLAGS
@@ -292,12 +299,6 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
     AUTOGENERATE="This file was automatically generated by configure"
     AC_SUBST(AUTOGENERATE)
 
-    STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null`
-    if test "x$STATE_VECTOR" != "x"; then
-       STATE_VECTOR="\$(depth)/$STATE_VECTOR"
-    fi
-    AC_SUBST(STATE_VECTOR)
-
     CONFIGSUFFIX=
     AC_ARG_ENABLE(config,
     [  enable-config=FILE      put configure settings in config-FILE.make],