From: Julien Rioux <jrioux@physics.utoronto.ca>
Date: Fri, 15 Mar 2013 21:43:57 +0000 (-0400)
Subject: configure: Check for mfplain.mp (issue 3233).
X-Git-Tag: release/2.17.15-1~17^2~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0840d13e6d695215b1c353c35eaf32bfd78b3709;p=lilypond.git

configure: Check for mfplain.mp (issue 3233).

./configure is now checking if required metapost files are
installed on the system. Metapost is a required dependency.
Also, kpsewhich isn't optional anymore, since we rely on it
to check for metapost required files.
---

diff --git a/aclocal.m4 b/aclocal.m4
index 4d5710ba9e..e2888727bd 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1083,8 +1083,18 @@ void *p = v.data ();
 
 
 AC_DEFUN(STEPMAKE_TEXMF_DIRS, [
-    # ugh
-    STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL)
+    STEPMAKE_PROGS(KPSEWHICH, kpsewhich, $1)
+
+    AC_MSG_CHECKING(for metapost required files)
+    if test "$MFPLAIN_MP" = ""; then
+        MFPLAIN_MP=`kpsewhich -format=mp mfplain`
+    fi
+    if test "$MFPLAIN_MP" = ""; then
+        AC_MSG_RESULT(no)
+        STEPMAKE_ADD_ENTRY($1,['metapost CTAN package (texlive-metapost)'])
+    else
+        AC_MSG_RESULT(yes)
+    fi
 ])
 
 AC_DEFUN(STEPMAKE_TEXMF, [
diff --git a/configure.ac b/configure.ac
index 2ae2f6cbb9..2502851835 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,7 +121,7 @@ STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
-STEPMAKE_TEXMF_DIRS
+STEPMAKE_TEXMF_DIRS(REQUIRED)
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2)
 
 # check for 3 typedefs added in Guile 1.9