* stepmake/bin/install-sh: Include latest from libtool.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 6e0c34df904a395835d7c8c7b50e5439b9ff2cfa..8c498a8f515599f0e628b2394d64c9aa7f03f025 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,29 +6,36 @@ 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
+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
 
-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
+STEPMAKE_CXX(REQUIRED)
+STEPMAKE_GXX(REQUIRED)
+STEPMAKE_CXXTEMPLATE
+STEPMAKE_BISON(REQUIRED, 1.25)
+STEPMAKE_FLEX(REQUIRED)
+STEPMAKE_LIB(REQUIRED)
+STEPMAKE_LOCALE
+STEPMAKE_GETTEXT
+STEPMAKE_MSGFMT(REQUIRED)
+STEPMAKE_TEXMF
+STEPMAKE_TEXMF_DIRS
+STEPMAKE_GUILE(OPTIONAL)
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.3.4)
+STEPMAKE_KPATHSEA
+STEPMAKE_MAKEINFO(REQUIRED)
+STEPMAKE_PYTHON_DEVEL(REQUIRED)
+
+##need perl for help2man.
+STEPMAKE_PERL(OPTIONAL)
 
 
 if test "$optimise_b" = yes; then
@@ -37,10 +44,6 @@ if test "$optimise_b" = yes; then
 fi
 
 
-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)
@@ -48,16 +51,7 @@ 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
-
-
-dnl need perl for help2man.
-AC_PATH_PROG(PERL, perl, error)
-
-AC_HAVE_HEADERS(python2.2/Python.h python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h)
-
-
-AC_STEPMAKE_END
+STEPMAKE_END
 
 test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""