Remove old TODO comments.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 9eda3c608744cf93792803a73c4caca98f275564..0c4c47aa387284da5e43d791f4cbdc7af79cfe03 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -70,7 +70,7 @@ if test "$NCSB_DIR" != "" ;  then
 else
   if test "$FCMATCH" != ""; then
     for style in Roman Italic "Bold Italic" Bold; do
-      NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:'`
+      NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:' | grep -v "\.ttf"`
 
       NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
       NCSB_FILE=`$PYTHON "$srcdir/buildscripts/readlink.py" $NCSB_FILE`
@@ -128,7 +128,7 @@ AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt))
 CPPFLAGS="$save_CPPFLAGS"
 
 
-STEPMAKE_MAKEINFO(REQUIRED, 4.8)
+STEPMAKE_MAKEINFO(REQUIRED, 4.11)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
@@ -164,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
 
@@ -185,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
 
@@ -197,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