release: 0.1.59

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 13bf8fd95f400577ca38320837518054d8692c75..5b00c8f99d2a86972e637d761af52248e8b72e3b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,11 +3,11 @@ dnl  Process this file with autoconf to produce a configure script.
 
 
 AC_INIT(flower/choleski.cc)
-AC_CONFIG_HEADER(config.hh:config.hh.in) #ugh flower/out/
+AC_CONFIG_HEADER($CONFIGFILE.hh:config.hh.in) #ugh flower/out/
 AC_CONFIG_AUX_DIR(bin)
 AC_CANONICAL_HOST
 
-OUTDIR_NAME=out
+
 . $srcdir/VERSION
 FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
 if test x$MY_PATCH_LEVEL != x; then
@@ -47,12 +47,16 @@ AC_PROG_YACC
 # ugh, ugh
 ac_cv_prog_lex_root=lex.yy
 
+# -O is necessary to get inlining
+OPTIMIZE="-O"
 printing_b=no
 checking_b=yes
 optimise_b=no
 profile_b=no
-
+CONFIGSUFFIX=
 debug_b=yes
+     
+
 
 AC_LANG_CPLUSPLUS
 
@@ -96,6 +100,11 @@ AC_ARG_ENABLE(mf-dir,
      [MFDIR=$enableval],
      [MFDIR=auto])
 
+AC_ARG_ENABLE(config,
+     [  enable-config=FILE            put configure settings in config-FILE.make],
+     [CONFIGSUFFIX=$enableval])
+     
+
 if test "$printing_b" = no; then
     AC_DEFINE(NPRINT)
 fi
@@ -105,7 +114,8 @@ if test "$checking_b" = no; then
 fi
 
 if test "$optimise_b" = yes; then
-    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
+    DEFINES="$DEFINES -finline-functions -DSTRING_UTILS_INLINED"
+    OPTIMIZE="-O2"
     AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 
@@ -132,11 +142,19 @@ else
     ZIP="zip -r -9"
 fi
 
+if test "$CONFIGSUFFIX" != "" ; then
+    CONFIGFILE=config-$CONFIGSUFFIX
+else
+    CONFIGFILE=config
+fi
+     
+
+
 dnl COMPILEINFO="$HOST $host $TARGET $target"
 AUTOGENERATE="This file was automatically generated by configure"
 CPPFLAGS=${CPPFLAGS:-""}       # we don't want -g -O junk
 # CXXFLAGS=${CXXFLAGS:-""}     # we don't want -g -O junk
-CXXFLAGS=$DEFINES
+CXXFLAGS="$DEFINES $OPTIMIZE"
 LDFLAGS=$EXTRA_LIBES
 
 AC_PROG_CXX
@@ -189,7 +207,7 @@ AC_SUBST(MFDIR)
 AC_SUBST(DIR_DATADIR)
 AC_SUBST(absolute_builddir)
 AC_SUBST(EXTRA_LIBES)
-AC_SUBST(OUTDIR_NAME)
+AC_SUBST(CONFIGSUFFIX)
 AC_CHECK_PROGS(BISON, bison, error)
 AC_CHECK_PROGS(FLEX, flex, error)
 AC_CHECK_PROGS(MAKE, make, error)
@@ -262,7 +280,7 @@ touch stamp-h.in
 
 
 # first do Foobar/Makefile then Foobar/include/Makefile
-AC_OUTPUT(config.make)
+AC_OUTPUT($CONFIGFILE.make:config.make.in)
 
 rm -f Makefile
 cp make/Toplevel.make.in ./Makefile