Make lilypond's way of calling mf2pt1 work again with recent mpost versions.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index df58c9c16ff4a5cdd24b47f9884e92746b3fc091..cf0178f457b5c3ac0e0971ebe23617f2aacc0584 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -112,13 +112,16 @@ STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2)
 
-# check for 2 typedefs added in Guile 1.9
-save_CFLAGS="$CFLAGS"
-CFLAGS="$GUILE_CFLAGS $CFLAGS"
+# check for 3 typedefs added in Guile 1.9
+save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$GUILE_CFLAGS $CXXFLAGS"
 AC_CHECK_TYPES([scm_t_hash_fold_fn, scm_t_hash_handle_fn],
               [AC_DEFINE(HAVE_GUILE_HASH_FUNC)], [],
               [#include <libguile.h>])
-CFLAGS="$save_CFLAGS"
+AC_CHECK_TYPES([scm_t_subr],
+              [AC_DEFINE(HAVE_GUILE_SUBR_TYPE)], [],
+              [#include <libguile.h>])
+CXXFLAGS="$save_CXXFLAGS"
 
 ## check rational bugfix.
 save_CPPFLAGS="$CPPFLAGS"
@@ -137,7 +140,8 @@ STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.60)
 
-STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20100501)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, OPTIONAL, 20110222)
 
 STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)
 
@@ -146,7 +150,7 @@ AC_CHECK_HEADERS([sstream])
 AC_HEADER_STAT
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf memmem snprintf vsnprintf wcrtomb])
+AC_CHECK_FUNCS([chroot fopencookie gettext isinf memmem snprintf vsnprintf])
 
 STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
 
@@ -168,7 +172,7 @@ HOST_ARCH=`$CC -dumpmachine`
 AC_SUBST(HOST_ARCH)
 
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
-STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)
+STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.4.0)
 STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
 
 STEPMAKE_WINDOWS
@@ -183,6 +187,14 @@ STEPMAKE_PERL(OPTIONAL)
 
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
 STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.82)
+STEPMAKE_PROGS(DBLATEX, dblatex, OPTIONAL)
+STEPMAKE_PROGS(PDFLATEX, pdflatex, OPTIONAL)
+STEPMAKE_PROGS(NETPBM, pngtopnm, OPTIONAL)
+STEPMAKE_PROGS(IMAGEMAGICK, convert, OPTIONAL)
+# this name avoids a conflict with ZIP in stepmake/aclocal.m4
+STEPMAKE_PROGS(ZIPDOC, zip, OPTIONAL)
+STEPMAKE_PROGS(RSYNC, rsync, OPTIONAL)
+
 
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")