X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=cf0178f457b5c3ac0e0971ebe23617f2aacc0584;hb=2e64d8a758a2fc90734568e79303dc92950000bc;hp=de37814012d5ff287628a84722890d41a045d881;hpb=a82dc4a0cca57f285e818f6c227c8428a3c02a71;p=lilypond.git

diff --git a/configure.in b/configure.in
index de37814012..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)