X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=15a41e98e0a71b37a44aab00c7172b2f52061830;hb=b8514b0fc731eb5a53b83d23cbb175e294c38bee;hp=4d91c761937d1c942a5bf574c707ba1c0a3bd855;hpb=d46cb09e6b94e4e19fbe45df2010221a74846c59;p=lilypond.git

diff --git a/configure.in b/configure.in
index 4d91c76193..15a41e98e0 100644
--- a/configure.in
+++ b/configure.in
@@ -110,6 +110,11 @@ STEPMAKE_TEXMF_DIRS
 
 ## should check for 1.8.2 ?  
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.0)
+
+
+## check rational bugfix.
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS"
 AC_MSG_CHECKING(GUILE rational bugfix)
 AC_TRY_CPP(
 #include <libguile.h>
@@ -120,6 +125,8 @@ AC_TRY_CPP(
 AC_MSG_RESULT(ok),
 REQUIRED="$REQUIRED GUILE-with-rational-bugfix"
 AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt))
+CPPFLAGS="$save_CPPFLAGS"
+
 
 STEPMAKE_MAKEINFO(REQUIRED, 4.8)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
@@ -157,7 +164,7 @@ AC_SUBST(HOST_ARCH)
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
 #STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
 STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)
-STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0)
+STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
 
 STEPMAKE_WINDOWS
 
@@ -178,6 +185,9 @@ STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.8)
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
 
+# must also have local.make if configure fails.
+touch local.make
+
 # Gather requirements and generate output.
 STEPMAKE_END
 
@@ -190,4 +200,7 @@ Type:
     make$mc install   to install LilyPond
     make$mc help      to see all possible targets
 
+Edit local.make for local Makefile overrides.
+
+
 EOF