* GNUmakefile.in (short-examples):

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 636d386f3500e59c182cae414be541d70de56e85..c995b8e803e53b2eb34ea89be9adaaa929c799fd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,57 +2,73 @@ 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_INIT
+AC_CONFIG_SRCDIR([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
-# AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h)
-AC_HAVE_HEADERS(assert.h sys/stat.h)
-AC_HEADER_STAT
 
-DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
-AC_DEFINE(STRINGS_UTILS_INLINED)
-
-AC_STEPMAKE_CXX
-AC_STEPMAKE_GXX
-AC_STEPMAKE_CXXTEMPLATE
-AC_STEPMAKE_LEXYACC
-AC_STEPMAKE_LIB
-AC_STEPMAKE_LOCALE
-AC_STEPMAKE_GETTEXT
-AC_STEPMAKE_MSGFMT
-AC_STEPMAKE_TEXMF
-AC_STEPMAKE_TEXMF_DIRS
-AC_STEPMAKE_GUILE
-AC_STEPMAKE_KPATHSEA
-AC_STEPMAKE_BIBTEX2HTML
-
-dnl should check out -print
-dnl huh?
-dnl AC_CHECK_SEARCH_RESULT($FIND, find, Please use --enable-tex-dir)
+# 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_CHECK_HEADERS([limits.h malloc.h string.h unistd.h values.h])
+AC_CHECK_HEADERS([assert.h sys/stat.h])
+AC_HEADER_STAT
 
 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_STEPMAKE_MAKEINFO
+## 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)
 
-AC_PATH_PROG(PERL, perl, error)
 
-AC_HAVE_HEADERS(python2/Python.h python/Python.h python1.5/Python.h Python.h)
+if test "$optimise_b" = yes; then
+    DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
+    AC_DEFINE(STRINGS_UTILS_INLINED)
+fi
+
+
+AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
+AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
+# Gather requirements and generate output.
+STEPMAKE_END
 
-AC_STEPMAKE_END
 
 test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""