patch::: 1.0.15.jcn1: (+ 1 2)

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 9aae46c03267a191383438dfc08167654ed3afa5..5844b69dcf07e88a09b61d3b99db8c88b387cdf4 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -396,7 +396,7 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [
     fi
 ])
 
-AC_DEFUN(AC_STEPMAKE_TEXMF, [
+AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
     AC_ARG_ENABLE(tex-prefix,
     [  enable-tex-prefix=DIR   set the tex-directory to find TeX subdirectories. (default: PREFIX)],
     [TEXPREFIX=$enableval],
@@ -425,12 +425,29 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [
     if test "x$TEXDIR" = xauto ; then
        AC_TEX_SUBDIR(TEXDIR)
     fi
-
     AC_SUBST(TEXPREFIX)
     AC_SUBST(TEXDIR)
     AC_SUBST(MFDIR)
 ])
 
+AC_DEFUN(AC_STEPMAKE_TEXMF, [
+    # urg, never know what names these teTeX guys will think up
+    AC_CHECK_PROGS(METAFONT, mf, no)
+    if test "x$METAFONT" = "xno"; then
+       AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont)
+       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_SUBST(METAFONT)
+    AC_SUBST(METAPOST)
+])
+
 AC_DEFUN(AC_STEPMAKE_WARN, [
     AC_MSG_WARN($1)
     warn_b=yes