X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aclocal.m4;h=c3aad4ba2156cf7a7040ad330f7cefe9f567adfc;hb=949737e17ed7cbc231a3c08e45d32897a636d94d;hp=89e1a1018e40e01d6304e578949baf87086e4655;hpb=cdb6065c5d3195a1f5351970ab2ca584260f413e;p=lilypond.git

diff --git a/aclocal.m4 b/aclocal.m4
index 89e1a1018e..c3aad4ba21 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2,6 +2,8 @@ dnl WARNING WARNING WARNING WARNING
 dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl WARNING WARNING WARNING WARNING
 dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
+dnl WARNING WARNING WARNING WARNING
+dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
@@ -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, [