X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=e048975f72eb447b1be0e429e9f8cb1bad7c1d44;hb=d02fb0875e52111272553a47e657b6f58e136e22;hp=0d8e38facb2336538de2da5ee1b445cfc4a283ef;hpb=1aa0b269044885643c505b7e67398f46eef914a4;p=lilypond.git

diff --git a/configure.in b/configure.in
index 0d8e38facb..e048975f72 100644
--- a/configure.in
+++ b/configure.in
@@ -9,28 +9,30 @@ AC_INIT
 AC_CONFIG_AUX_DIR([stepmake/bin])
 # For stepmake package:
 # AC_CONFIG_AUX_DIR(bin)
+
+
 STEPMAKE_INIT
 
+
+
 # List a file that identifies your package.
 AC_CONFIG_SRCDIR([lily/main.cc])
 
 # Move to aclocal.m4?
 AC_CONFIG_HEADER([$CONFIGFILE.h:config.hh.in])
 
-# For all packages except the StepMake package itself
-AC_CONFIG_SUBDIRS(stepmake)
-
 # Uncomment the configuration options your package needs.
 
 # must come before any header checks
 STEPMAKE_COMPILE
 
-STEPMAKE_PYTHON(REQUIRED,2.0)
+STEPMAKE_PYTHON(REQUIRED,2.1)
 STEPMAKE_GCC(REQUIRED, 2.8)
 STEPMAKE_CXX(REQUIRED)
-STEPMAKE_GXX(REQUIRED, 2.95)
+STEPMAKE_GXX(REQUIRED, 3.0.5)
 STEPMAKE_CXXTEMPLATE
 STEPMAKE_LIB(REQUIRED)
+# Do not use bison 1.50 and 1.75.
 STEPMAKE_BISON(REQUIRED, 1.25)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
@@ -50,7 +52,7 @@ AC_HEADER_STAT
 
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([memmem snprintf vsnprintf gettext isinf])
+AC_CHECK_FUNCS([gettext isinf memmem snprintf vsnprintf gettext])
 
 
 ## Optional tools for building documentation, website, extra fonts.
@@ -60,9 +62,10 @@ STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, pktrace mftrace, OPTIONAL, 1.0.17)
+STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.17)
+
 # new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.1)
+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.6)
 
 
 if test "$optimise_b" = yes; then