X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=d830d1268dc6fcb47daf884c3ee853a64ca565da;hb=550d28cc8b08476b7673afd42802246f452ee883;hp=10a18a76b29da98b39bbb1c729c2866203862c1f;hpb=7754ac4c2bde14d03af8a85d46c6a9e26fa0734b;p=lilypond.git

diff --git a/configure.in b/configure.in
index 10a18a76b2..d830d1268d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,74 +1,91 @@
 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
-AC_STEPMAKE_INIT
+# For user package:
+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.
-AC_STEPMAKE_COMPILE
-# AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h)
-
-printing_b=no
-AC_ARG_ENABLE(printing,
-    [  enable-printing         turn on debug printing. Default: off],
-    [printing_b=$enableval])
-    
+
+# must come before any header checks
+STEPMAKE_COMPILE
+
+STEPMAKE_PYTHON(REQUIRED,2.0)
+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.6)
+STEPMAKE_KPATHSEA
+STEPMAKE_MAKEINFO(REQUIRED)
+STEPMAKE_PYTHON_DEVEL(REQUIRED)
+
+
+AC_CHECK_HEADERS([assert.h sys/stat.h sstream])
+AC_HEADER_STAT
+
+AC_FUNC_MEMCMP
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([gettext isinf memmem snprintf vsnprintf gettext])
+
+
+## Optional tools for building documentation, website, extra fonts.
+
+# guile executable for some scripts
+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)
+# 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
 
-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_YODL
-AC_STEPMAKE_GUILE
-
-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)
 
 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
-AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
-AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl,  
-    You should install Yodl 1.30.2 or newer)
-
-AC_MSG_CHECKING(links for running from sourcetree)
-LILYPONDPREFIX=$absolute_builddir
-LOCALES="it nl"
-for i in $LOCALES; do
-	dir=$LILYPONDPREFIX/share/locale/$i/LC_MESSAGES
-	if test ! -x $dir ; then
-		mkdir -p $dir
-	fi
-	rm -f $dir/lilypond.mo 
-	ln -sf $LILYPONDPREFIX/po/out/$i.mo $dir/lilypond.mo
-done
-rm -f afm; ln -sf $LILYPONDPREFIX/mf/out afm
-rm -f tfm; ln -sf $LILYPONDPREFIX/mf/out tfm
-rm -f cmtfm; ln -sf $TEX_TFMDIR cmtfm
-AC_MSG_RESULT(ok)
-
-AC_STEPMAKE_END
+# Gather requirements and generate output.
+STEPMAKE_END
+
+
+test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""
+
+cat <<EOF
+
+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 should not build.
+EOF