X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=de37814012d5ff287628a84722890d41a045d881;hb=7f2a45dd1f9e2b326282f8be152a916180a85c8c;hp=51be105f6cde45bb41e70cae16a1c2635fc3f2c2;hpb=6f306450f46e9321d70af63deaa4b7457361fb17;p=lilypond.git

diff --git a/configure.in b/configure.in
index 51be105f6c..de37814012 100644
--- a/configure.in
+++ b/configure.in
@@ -113,12 +113,12 @@ 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"
+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"
+CXXFLAGS="$save_CXXFLAGS"
 
 ## check rational bugfix.
 save_CPPFLAGS="$CPPFLAGS"
@@ -138,6 +138,9 @@ 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(T1ASM, t1asm, REQUIRED)
 
@@ -168,7 +171,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 +186,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}")