X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=15a41e98e0a71b37a44aab00c7172b2f52061830;hb=6e4f124c90a9daa8e85191b1a3f45f0430bc7e8e;hp=489457146a90d9116001906651e926bb3575d993;hpb=73007fc6a7fdcacd1844380c1c74eb0928099369;p=lilypond.git

diff --git a/configure.in b/configure.in
index 489457146a..15a41e98e0 100644
--- a/configure.in
+++ b/configure.in
@@ -88,6 +88,7 @@ AC_MSG_RESULT($NCSB_SOURCE_FILES)
 
 STEPMAKE_PYTHON(REQUIRED, 2.4)
 STEPMAKE_GCC(REQUIRED, 4.0)
+
 STEPMAKE_CXX(REQUIRED)
 STEPMAKE_GXX(REQUIRED, 4.0)
 STEPMAKE_CXXTEMPLATE
@@ -106,7 +107,27 @@ STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.7)
+
+## 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>
+#ifdef SCM_FRACTION_REDUCED_BIT
+#error 
+#endif
+,
+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)
 
@@ -143,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
 
@@ -159,10 +180,14 @@ STEPMAKE_PERL(OPTIONAL)
 # makeinfo should avoid bug reports; if people want to build lily
 # without the docs, they can find this comment and use an older
 # makeinfo--but hopefully won't report makeinfo problems.
-STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
+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
 
@@ -175,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