release: 1.5.48

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 0c3c31bd785752fe0a345a121641ac08eafadf96..3f659588d829bed2898566d5dd6361de4d50c630 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -267,7 +267,6 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
        AC_MSG_RESULT($builddir)
 
        (cd stepmake 2>/dev/null || mkdir stepmake)
-       (cd stepmake; rm -f stepmake; ln -s ../$srcdir/stepmake .)
        (cd stepmake; rm -f bin; ln -s ../$srcdir/bin .)
        AC_CONFIG_AUX_DIR(bin)
        stepmake=stepmake
@@ -695,25 +694,12 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
        METAFONT=$MFONT
     fi
 
-    AC_CHECK_PROGS(METAPOST, mp, no)
-    if test "x$METAPOST" = "xno"; then
-       AC_CHECK_PROGS(MPOST, mpost, -echo no mp or mpost)
-
-       METAPOST=$MPOST
-    fi
-
     AC_CHECK_PROGS(INIMETAFONT, inimf, no)
     if test "x$INIMETAFONT" = "xno"; then
        AC_CHECK_PROGS(INIMFONT, inimfont, -echo no inimf or inimfont)
        INIMETAFONT=$INIMFONT
     fi
 
-    AC_CHECK_PROGS(INIMETAPOST, inimp, no)
-    if test "x$INIMETAPOST" = "xno"; then
-       AC_CHECK_PROGS(INIMPOST, inimpost, -echo no inimp or inimpost)
-       INIMETAPOST=$INIMPOST
-    fi
-
     AC_MSG_CHECKING(for working metafont mode)
     modelist='ljfour lj4 lj3 lj2 ljet laserjet'
     for MFMODE in $modelist; do
@@ -724,30 +710,11 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
     done
     AC_MSG_RESULT($MFMODE)
 
-    AC_MSG_CHECKING(for mfplain.mp)
-    #
-    # For now let people define these in their environments
-    #
-    : ${MFPLAIN_MP=`kpsewhich --format mp mfplain.mp`}
-    AC_MSG_RESULT($MFPLAIN_MP)
-
-    AC_MSG_CHECKING(for inimetapost flags)
-    if test  ${INIMETAPOST} = "inimp" ; then
-       : ${INIMETAPOST_FLAGS=''}
-    else
-       : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'}
-    fi
-    AC_MSG_RESULT($INIMETAPOST_FLAGS)
-
     rm -f mfput.*
 
     AC_SUBST(METAFONT)
-    AC_SUBST(METAPOST)
     AC_SUBST(MFMODE)
     AC_SUBST(INIMETAFONT)
-    AC_SUBST(INIMETAPOST)
-    AC_SUBST(MFPLAIN_MP)
-    AC_SUBST(INIMETAPOST_FLAGS)
 ])
 
 AC_DEFUN(AC_STEPMAKE_WARN, [