X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=1948109ea3a6b3bcdf8b9a73f47939f641bdd4be;hb=1ed3ca1ad8893fc2cb76aa67a0830bcf52e2502c;hp=2194cfbb7c5a32323de99224b98a9b939a780e79;hpb=432ed8dd7e504edf96f8137cde48ec01a396d60b;p=lilypond.git

diff --git a/configure.in b/configure.in
index 2194cfbb7c..1948109ea3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,47 +1,59 @@
 dnl configure.in   -*-shell-script-*-
 dnl Process this file with autoconf to produce a configure script. 
 
-# Bootstrap the init proces.  List a file identifies your package.
-AC_INIT(make/lilypond.lsm.in)
-AC_CONFIG_HEADER($CONFIGFILE.h:config.hh.in)
+# Bootstrap the init proces.
+AC_INIT
 
 # Bootstrap StepMake configure
+# For user package:
+AC_CONFIG_AUX_DIR([stepmake/bin])
+# For stepmake package:
+# AC_CONFIG_AUX_DIR(bin)
+
+
 STEPMAKE_INIT
 
-# For all packages except the StepMake package itself
-AC_CONFIG_SUBDIRS(stepmake)
+
+
+# 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])
 
 # Uncomment the configuration options your package needs.
 
 # must come before any header checks
 STEPMAKE_COMPILE
 
+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)
+AC_LANG_C
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF
 STEPMAKE_TEXMF_DIRS
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.3.4)
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6)
 STEPMAKE_KPATHSEA
 STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 
-# AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h)
-AC_HAVE_HEADERS(assert.h sys/stat.h)
+AC_CHECK_HEADERS([assert.h sys/stat.h sstream])
 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.
@@ -50,10 +62,12 @@ AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext isinf)
 STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
-# pktrace for generating pfa's, pfb's
-STEPMAKE_PROGS(PKTRACE, pktrace, OPTIONAL, 1.0.3)
+# mftrace for generating pfa's, pfb's
+STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.27)
+
 # new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.1)
+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.6)
+AC_SUBST(MAKEINFO_VERSION)
 
 
 if test "$optimise_b" = yes; then
@@ -65,21 +79,6 @@ fi
 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
-# Check for guile ./configure'd --with-threads
-# which shows nasty memory corruption errors.
-# Until we found the real cause, advise no to use threads
-exe=`STEPMAKE_GET_EXECUTABLE($guile_config)`
-if test -n "$exe" -a -x "$exe"; then
-    AC_MSG_CHECKING(["for guile, ./configure\'d --without-threads"])
-    link=`$guile_config link`
-    if expr "$link" : '.*\(thread\)' >/dev/null 2>&1; then
- 	STEPMAKE_ADD_ENTRY(OPTIONAL, ["guile, ./configure'd --without-threads (using guile with threads may give nasty memory corruption errors on large scores)."])
-	AC_MSG_RESULT(["no, watch out."])
-    else
-	AC_MSG_RESULT(["yes, good."])
-    fi
-fi    
-
 # Gather requirements and generate output.
 STEPMAKE_END
 
@@ -93,5 +92,5 @@ Type:
     make$mc install   to install LilyPond
     make$mc help      to see all possible targets
 
-Do not worry if ./Documentation or ./mutopia should not build.
+Do not worry if ./Documentation should not build.
 EOF