release: 0.1.44

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 2e0c385e877ab5c6a1c7f173996a0a9cd9aa3681..31fb7264115e4ec58678cbdfdb0850ee0f67e1f1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -48,27 +48,27 @@ AC_ARG_ENABLE(profiling,
     [profile_b=$enableval])
     
 AC_ARG_ENABLE(mingw-prefix,
-    [  mingw-prefix=DIR        set the mingw32 directory (standalone windows32 exes)],
+    [  enable-mingw-prefix=DIR        set the mingw32 directory (standalone windows32 exes)],
     [MINGWPREFIX=$enableval],
     [MINGWPREFIX=no])
     
 AC_ARG_ENABLE(tex-prefix,
-    [  tex-prefix=DIR          set the tex-directory to find TeX subdirectories. (default: PREFIX)],
+    [  enable-tex-prefix=DIR          set the tex-directory to find TeX subdirectories. (default: PREFIX)],
     [TEXPREFIX=$enableval],
     [TEXPREFIX=auto] )
     
 AC_ARG_ENABLE(tex-dir,
-    [  tex-dir=DIR             set the directory to put LilyPond TeX files in. ],
+    [  enable-tex-dir=DIR             set the directory to put LilyPond TeX files in. ],
     [TEXDIR=$enableval],
     [TEXDIR=auto] )
 
 AC_ARG_ENABLE(mf-dir,
-     [  mf-dir=DIR             set the directory to put LilyPond MetaFont files in. (obsolete)],
+     [  enable-mf-dir=DIR             set the directory to put LilyPond MetaFont files in. ],
      [MFDIR=$enableval],
      [MFDIR=auto])
 
 AC_ARG_ENABLE(out-dir,
-    [  out-dir                 set the directory for machine generated files. Default out or out-HOST],
+    [  enable-out-dir                 set the directory for machine generated files. Default out or out-HOST],
     [OUTDIR_NAME=$enableval]
     [])
 
@@ -95,7 +95,7 @@ if test x$MINGWPREFIX != xno; then
 fi
 
 if test $optimise_b = yes; then
-    DEFINES="$DEFINES -O2 -DSTRING_UTILS_INLINED"
+    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
 fi
 
 if test "x$OSTYPE" = "xWindows_NT"; then
@@ -134,6 +134,7 @@ AC_SUBST(BISON)
 AC_SUBST(FLEX)
 AC_SUBST(LN)
 AC_SUBST(PERL)
+AC_SUBST(PYTHON)
 AC_SUBST(ZIP)
 AC_SUBST(TEXPREFIX)
 AC_SUBST(TEXDIR)
@@ -145,6 +146,7 @@ AC_CHECK_PROGS(BISON, bison, error)
 AC_CHECK_PROGS(FLEX, flex, error)
 AC_CHECK_PROGS(MAKE, make, error)
 AC_PATH_PROG(PERL, perl, error)
+AC_PATH_PROG(PYTHON, python, error)
 AC_CHECK_PROGS(PODMAN, pod2man, error)
 
 
@@ -169,8 +171,9 @@ AC_JUNK_ARGS( [if test "x$MFDIR" = xauto; then
 )
 
 AC_CHECK_SEARCH_RESULT($MAKE, GNU make,  You should install GNU make)
-AC_CHECK_SEARCH_RESULT( $BISON, bison,  Please install Bison, 1.25 or better)
+AC_CHECK_SEARCH_RESULT($BISON, bison,  Please install Bison, 1.25 or better)
 AC_CHECK_SEARCH_RESULT($PERL, perl, You should install Perl, version 5 or better)
+AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python)
 AC_CHECK_SEARCH_RESULT($PODMAN, pod,  You should install Perl, version 5 or better)
 AC_CHECK_SEARCH_RESULT( $FLEX,  flex, Please install Flex, 2.5 or better)