X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=1597831177a63eb43c8709ecab06c8629230fd32;hb=e11dc9a89c31b64615bcdcb8b536621ded30176b;hp=4f251a61fe109d0579dd3fd67b4e401d5a3e42fc;hpb=42f8deef7987e10169196db9837e603100f53985;p=lilypond.git

diff --git a/configure.in b/configure.in
index 4f251a61fe..1597831177 100644
--- a/configure.in
+++ b/configure.in
@@ -14,32 +14,29 @@ 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_TEXMF_DIRS
-AC_STEPMAKE_YODL
+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
 
-CXXFLAGS="$CXXFLAGS -fhandle-signatures" 
 
 dnl should check out -print
 dnl huh?
@@ -47,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 newer)
+AC_STEPMAKE_MAKEINFO
+
+AC_PATH_PROG(PERL, perl, error)
+
+AC_HAVE_HEADERS(python2.1/Python.h 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