X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=e64d0e859d0b75e486d21446ffa27fe98d18428a;hb=107ed06920290e5347bca0e683a75cc7834b1a4a;hp=0774dcc8244cb6a7b02601e3e52139ae16a5cf0e;hpb=59ed0cee2aae58a3f0483f21261c68aee406fa10;p=lilypond.git

diff --git a/configure.in b/configure.in
index 0774dcc824..e64d0e859d 100644
--- a/configure.in
+++ b/configure.in
@@ -14,28 +14,28 @@ 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])
-
-if test "$optimise_b" = yes; then
-    DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
-    AC_DEFINE(STRINGS_UTILS_INLINED)
-fi
+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_LIBTOOL
 AC_STEPMAKE_LOCALE
 AC_STEPMAKE_GETTEXT
 AC_STEPMAKE_MSGFMT
-# AC_STEPMAKE_TEXMF
-AC_STEPMAKE_YODL
+AC_STEPMAKE_TEXMF
+AC_STEPMAKE_TEXMF_DIRS
+AC_STEPMAKE_GUILE
+AC_STEPMAKE_KPATHSEA
+AC_STEPMAKE_BIBTEX2HTML
+
+
+if test "$optimise_b" = yes; then
+    DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
+    AC_DEFINE(STRINGS_UTILS_INLINED)
+fi
 
 
 dnl should check out -print
@@ -44,14 +44,28 @@ 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_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_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl,  
-    You should install Yodl 1.30.2 or better)
+AC_STEPMAKE_MAKEINFO
+
+AC_PATH_PROG(PERL, perl, error)
+
+AC_HAVE_HEADERS(python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h)
+
 
 AC_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 or ./mutopia should not build.
+EOF