X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=2194cfbb7c5a32323de99224b98a9b939a780e79;hb=680d569e15890605428c5174b438ac11b63c32d5;hp=aa3f16f08f51dc0d967ac316fbac7d82375225cc;hpb=77480597ed7c2654444535ac9c6f7636899dd322;p=lilypond.git

diff --git a/configure.in b/configure.in
index aa3f16f08f..2194cfbb7c 100644
--- a/configure.in
+++ b/configure.in
@@ -6,60 +6,92 @@ AC_INIT(make/lilypond.lsm.in)
 AC_CONFIG_HEADER($CONFIGFILE.h:config.hh.in)
 
 # Bootstrap StepMake configure
-AC_STEPMAKE_INIT
+STEPMAKE_INIT
 
 # For all packages except the StepMake package itself
 AC_CONFIG_SUBDIRS(stepmake)
 
 # Uncomment the configuration options your package needs.
-AC_STEPMAKE_COMPILE
+
+# must come before any header checks
+STEPMAKE_COMPILE
+
+STEPMAKE_GCC(REQUIRED, 2.8)
+STEPMAKE_CXX(REQUIRED)
+STEPMAKE_GXX(REQUIRED, 2.95)
+STEPMAKE_CXXTEMPLATE
+STEPMAKE_LIB(REQUIRED)
+STEPMAKE_BISON(REQUIRED, 1.25)
+STEPMAKE_FLEX(REQUIRED)
+STEPMAKE_FLEXLEXER(REQUIRED)
+STEPMAKE_LOCALE
+STEPMAKE_GETTEXT
+STEPMAKE_MSGFMT(REQUIRED)
+STEPMAKE_TEXMF
+STEPMAKE_TEXMF_DIRS
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.3.4)
+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_HEADER_STAT
 
-printing_b=no
-AC_ARG_ENABLE(printing,
-    [  enable-printing         turn on debug printing. Default: off],
-    [printing_b=$enableval])
+AC_FUNC_MEMCMP
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext isinf)
+
+
+## Optional tools for building documentation, website, extra fonts.
+
+# guile executable for some scripts
+STEPMAKE_GUILE(OPTIONAL)
+# perl for help2man.
+STEPMAKE_PERL(OPTIONAL)
+# pktrace for generating pfa's, pfb's
+STEPMAKE_PROGS(PKTRACE, pktrace, OPTIONAL, 1.0.3)
+# new makeinfo for multi-page website docs
+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.1)
+
 
 if test "$optimise_b" = yes; then
     DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
     AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 
-if test "$printing_b" = no; then
-    # ugh
-    AC_DEFINE(NPRINT)
-    DEFINES="$DEFINES -DNPRINT"
-fi
-
-AC_STEPMAKE_CXX
-AC_STEPMAKE_GXX
-AC_STEPMAKE_CXXTEMPLATE
-AC_STEPMAKE_LEXYACC
-AC_STEPMAKE_LIB
-# AC_STEPMAKE_LIBTOOL
-AC_STEPMAKE_LOCALE
-AC_STEPMAKE_GETTEXT
-AC_STEPMAKE_MSGFMT
-AC_STEPMAKE_TEXMF
-AC_STEPMAKE_TEXMF_DIRS
-AC_STEPMAKE_GUILE
-AC_STEPMAKE_KPATHSEA
-
-dnl should check out -print
-dnl huh?
-dnl AC_CHECK_SEARCH_RESULT($FIND, find, Please use --enable-tex-dir)
-
-AC_FUNC_MEMCMP
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext isinf)
 
 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
-AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
-AC_PATH_PROG(PERL, perl, error)
+# 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
+
+
+test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""
+
+cat <<EOF
 
-AC_STEPMAKE_END
+Type:
+    make$mc all       to build LilyPond
+    make$mc install   to install LilyPond
+    make$mc help      to see all possible targets
 
+Do not worry if ./Documentation or ./mutopia should not build.
+EOF