]> git.donarmstrong.com Git - lilypond.git/commitdiff
configure: Check for mfplain.mp (issue 3233).
authorJulien Rioux <jrioux@physics.utoronto.ca>
Fri, 15 Mar 2013 21:43:57 +0000 (17:43 -0400)
committerJulien Rioux <jrioux@physics.utoronto.ca>
Wed, 20 Mar 2013 20:07:45 +0000 (16:07 -0400)
./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.

aclocal.m4
configure.ac

index 4d5710ba9e9ce69ad7282562fec3908600e18563..e2888727bd74372f5b676ee2b708fda74e269e11 100644 (file)
@@ -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, [
index 2ae2f6cbb938c2a245e9a66b1dbdb9a828f1b1e6..25028518353e5ccef0bc379c5da0318c3519c44f 100644 (file)
@@ -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