X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aclocal.m4;h=74cf3bcb2c4030321bc796a313bdddd2e70805f9;hb=2f7cc8c9e89474feb89d1c435d8dc9b43235cc1c;hp=87d8474316adf7dced50154d180d117ff572ac0a;hpb=6421a3ea12cf519b165afc3700a86058bdcc381d;p=lilypond.git

diff --git a/aclocal.m4 b/aclocal.m4
index 87d8474316..74cf3bcb2c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -674,7 +674,7 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
 	AC_MSG_RESULT([$ver])
 	GUILE_CONFIG=$found
     else
-	STEPMAKE_ADD_ENTRY($1, "$guile_config (guile-devel, guile-dev or libguile-dev package) or guile1-config (guile1-devel package)")
+	STEPMAKE_ADD_ENTRY($1, "$guile_config (guile-devel, guile-dev or libguile-dev package)")
     fi
 
     AC_SUBST(GUILE_CONFIG)
@@ -1167,6 +1167,14 @@ AC_DEFUN(STEPMAKE_TEXMF_DIRS, [
 AC_DEFUN(STEPMAKE_TEXMF, [
     STEPMAKE_PROGS(METAFONT, mf-nowin mf mfw mfont, $1)
     STEPMAKE_PROGS(METAPOST, mpost, $1)
+    if test "$METAPOST" != ""; then
+	ver=`STEPMAKE_GET_VERSION($METAPOST)`
+	num=`STEPMAKE_NUMERIC_VERSION($ver)`
+	# Avoid buggy metapost versions: 1.600 <= x < 1.803
+	if test "$num" -ge "1600000" -a "$num" -lt "1803000"; then
+            STEPMAKE_ADD_ENTRY($1, ["mpost (due to a bug in metapost, versions 1.600 <= x < 1.803 are not supported; installed: $ver)"])
+	fi
+    fi
 
     AC_MSG_CHECKING(for working metafont mode)
     modelist='ljfour lj4 lj3 lj2 ljet laserjet'