X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=cf0178f457b5c3ac0e0971ebe23617f2aacc0584;hb=c3dd9fa24c62d6be2cf505a845ef6dfee90fa989;hp=f41aef700ad338f4068b13f9d6850d506f7bafaf;hpb=d7c0f4263534307616c82d9b2ce6fdef9472456f;p=lilypond.git

diff --git a/configure.in b/configure.in
index f41aef700a..cf0178f457 100644
--- a/configure.in
+++ b/configure.in
@@ -112,12 +112,15 @@ STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2)
 
-# check for 2 typedefs added in Guile 1.9
+# 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>])
+AC_CHECK_TYPES([scm_t_subr],
+	       [AC_DEFINE(HAVE_GUILE_SUBR_TYPE)], [],
+	       [#include <libguile.h>])
 CXXFLAGS="$save_CXXFLAGS"
 
 ## check rational bugfix.
@@ -137,10 +140,8 @@ STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.60)
 
-STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
-# For svg woff fonts to work, version 20100501 is required but
-# the build does not break; leave optional until distros ship it.
-STEPMAKE_PATH_PROG(FONTFORGE, fontforge, OPTIONAL, 20100501)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20100501)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, OPTIONAL, 20110222)
 
 STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)
 
@@ -188,6 +189,12 @@ 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}")