From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 3 Nov 2004 15:19:18 +0000 (+0000)
Subject: * configure.in: Bugfix: add REQUIRED parameter to STEPMAKE_TEXMF call
X-Git-Tag: release/2.4.2~3^2~23
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b4f4c967299a9b2dd17a5c11ebd319c141e6a3dd;p=lilypond.git

* configure.in: Bugfix: add REQUIRED parameter to STEPMAKE_TEXMF call
(carlyannehorse).  Also check for mf and mf-nowin.
---

diff --git a/ChangeLog b/ChangeLog
index 54aa839296..b765f07575 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-03  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* configure.in: Bugfix: add REQUIRED parameter to STEPMAKE_TEXMF call
+	(carlyannehorse).  Also check for mf and mf-nowin.
+
 	* GNUmakefile.in (builddir-exec): Add symlink tex/out.  Fixes
 	--srcdir build (Bertalan).
 
diff --git a/configure.in b/configure.in
index 27e838d06e..28c8f3f3bb 100644
--- a/configure.in
+++ b/configure.in
@@ -46,7 +46,7 @@ AC_LANG_C
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
-STEPMAKE_TEXMF
+STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6)
 STEPMAKE_KPATHSEA
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index ecf44f68f7..bf7f7f5b88 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1003,7 +1003,7 @@ AC_DEFUN(STEPMAKE_TEXMF_DIRS, [
 AC_DEFUN(STEPMAKE_TEXMF, [
     # urg, never know what names these teTeX guys will think up
 
-    STEPMAKE_PROGS(METAFONT, mf mfont, $1)
+    STEPMAKE_PROGS(METAFONT, mf-nowin mf mfw mfont, $1)
     STEPMAKE_PROGS(INIMETAFONT, inimf inimfont, $1)
 
     AC_MSG_CHECKING(for working metafont mode)