patch::: 1.5.39.jcn3

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index af4081418ac3cb51e8b9d7643238c4ebb260a4a1..e7a5ea11b137fa0e6fceafc7313b23ab89a835f3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,9 +17,6 @@ AC_STEPMAKE_COMPILE
 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
@@ -32,7 +29,13 @@ 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
 dnl huh?
@@ -49,14 +52,19 @@ AC_STEPMAKE_MAKEINFO
 
 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
 
+test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""
+
 cat <<EOF
 
 Type:
-    make all       to build LilyPond
-    make install   to install LilyPond
-    make help      to see all possible targets
+    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