patch::: 1.3.35.jcn1

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index c3aad4ba2156cf7a7040ad330f7cefe9f567adfc..92908e0e0a65cf53911b0af367a8929ec61fd007 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -162,6 +162,8 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
     if guile-config --version 2>&1 | grep -q 'version 1\.[012]'; then
        AC_STEPMAKE_WARN(Guile version 1.3 or better needed)
     fi
+    AC_PATH_PROG(GUILE, guile, error)
+    AC_SUBST(GUILE)
 ])
 
 AC_DEFUN(AC_STEPMAKE_INIT, [
@@ -566,7 +568,12 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
     # For now let people define these in their environments
     #
     : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`}
-    : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
+
+    if test  ${INIMETAPOST} = "inimp" ; then
+       : ${INIMETAPOST_FLAGS=''}
+    else
+       : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
+    fi
 
     rm -f mfput.*
     AC_MSG_RESULT($MFMODE)