patch::: 1.3.25.jcn2

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 89e1a1018e40e01d6304e578949baf87086e4655..3db837d204b4e2b4c85a7911787febcd4250bd9f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -160,6 +160,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, [
@@ -338,7 +340,6 @@ dnl    fi
     AC_SUBST(PATHSEP)
     AC_SUBST(DIRSEP)
   
-   
     AC_STEPMAKE_DATADIR
 ])
 
@@ -560,6 +561,13 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
            break;
        fi
     done
+
+    #
+    # For now let people define these in their environments
+    #
+    : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`}
+    : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
+
     rm -f mfput.*
     AC_MSG_RESULT($MFMODE)
 
@@ -568,6 +576,8 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
     AC_SUBST(MFMODE)
     AC_SUBST(INIMETAFONT)
     AC_SUBST(INIMETAPOST)
+    AC_SUBST(MFPLAIN_MP)
+    AC_SUBST(INIMETAPOST_FLAGS)
 ])
 
 AC_DEFUN(AC_STEPMAKE_WARN, [