lilypond-0.0.45

diff --git a/configure b/configure
index 3c13edc01f633432aaf07ea057df91dfcbb7fb92..ad504fd23df85b1ce6000e48527e8fd726e81102 100755 (executable)
--- a/configure
+++ b/configure
@@ -539,41 +539,51 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
 
-
+printing_b=no
+checking_b=yes
+debug_b=yes
+optimise_b=no
+profile_b=no
+    
 # Check whether --enable-printing or --disable-printing was given.
 if test "${enable_printing+set}" = set; then
   enableval="$enable_printing"
-  :
-else
-  DEFINES="$DEFINES -DNPRINT=1"
+  printing_b=$enableval
 fi
 
+
+       
 # Check whether --enable-checking or --disable-checking was given.
 if test "${enable_checking+set}" = set; then
   enableval="$enable_checking"
-  DEFINES="$DEFINES -DNDEBUG=1"
+  checking_b=$enableval 
 fi
 
+
+
+
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
-  :
-else
-  DEFINES="$DEFINES -g"
+  debug_b=$enableval
 fi
 
+
 # Check whether --enable-optimise or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then
   enableval="$enable_optimise"
-  DEFINES="$DEFINES -O2 -DSTRING_UTILS_INLINED"
+  optimise_b=$enableval
 fi
 
+    
+   
 # Check whether --enable-profiling or --disable-profiling was given.
 if test "${enable_profiling+set}" = set; then
   enableval="$enable_profiling"
-  DEFINES="$DEFINES -pg"
+  profile_b=$enableval
 fi
 
+    
 # Check whether --enable-texprefix or --disable-texprefix was given.
 if test "${enable_texprefix+set}" = set; then
   enableval="$enable_texprefix"
@@ -582,7 +592,26 @@ else
   TEXPREFIX=auto 
 fi
 
+   
+if test $profile_b = yes; then
+    EXTRA_LIBES="-pg"
+    DEFINES="$DEFINES -pg"
+fi
+    
+if test $printing_b = no; then
+    DEFINES="$DEFINES -DNPRINT=1"
+fi
+    
+if test $debug_b = yes; then   
+    DEFINES="$DEFINES -g"
+fi
+if test $checking_b = no; then
+    DEFINES="$DEFINES -DNDEBUG=1"
+fi
 
+if test $optimise_b = yes; then
+    DEFINES="$DEFINES -O2 -DSTRING_UTILS_INLINED"
+fi
 AUTOHEADER="This file was automatically generated by configure"
 CXXFLAGS=${CXXFLAGS:-""}       # we don't want -g -O junk
 for ac_prog in $CCC c++ g++ gcc CC cxx cc++
@@ -590,7 +619,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:594: checking for $ac_word" >&5
+echo "configure:623: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -621,7 +650,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:625: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:654: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -631,11 +660,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 635 "configure"
+#line 664 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -655,12 +684,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:659: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:688: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:664: checking whether we are using GNU C++" >&5
+echo "configure:693: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -669,7 +698,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -684,7 +713,7 @@ if test $ac_cv_prog_gxx = yes; then
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:688: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:717: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -714,7 +743,7 @@ fi
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:718: checking for $ac_word" >&5
+echo "configure:747: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -770,7 +799,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:774: checking for a BSD compatible install" >&5
+echo "configure:803: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -824,7 +853,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:828: checking for $ac_word" >&5
+echo "configure:857: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -871,7 +900,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:875: checking for $ac_word" >&5
+echo "configure:904: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -905,7 +934,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:909: checking for $ac_word" >&5
+echo "configure:938: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -939,7 +968,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:943: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -973,7 +1002,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:977: checking for $ac_word" >&5
+echo "configure:1006: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PODMAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1009,7 +1038,7 @@ if test $TEXPREFIX = auto ; then
     # do something sensible if root hasn't specced dir yet attempts install
 
     echo $ac_n "checking TeX installation directory""... $ac_c" 1>&6
-echo "configure:1013: checking TeX installation directory" >&5
+echo "configure:1042: checking TeX installation directory" >&5
 
     ac_tmp_prefix=$prefix
     test "x$ac_tmp_prefix" = xNONE && ac_tmp_prefix=$ac_default_prefix
@@ -1041,7 +1070,7 @@ if test $MAKE = "error"
 then
        { echo "configure: error: Please install GNU make" 1>&2; exit 1; }
 else
-       $MAKE -v| grep -q GNU
+       $MAKE -v| grep GNU >& /dev/null
        if test "$?" = 1
        then
                echo "configure: warning: Please install *GNU* make" 1>&2
@@ -1064,7 +1093,7 @@ then
        echo "configure: warning: can't find flex. Please install Flex (2.5 or better)" 1>&2
 fi
 
-if $CXX --version | grep -q '2\.7'
+if $CXX --version | grep '2\.7' >& /dev/null
 then
        true
 else
@@ -1072,7 +1101,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1076: checking how to run the C++ preprocessor" >&5
+echo "configure:1105: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1085,12 +1114,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 1089 "configure"
+#line 1118 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1110,17 +1139,17 @@ echo "$ac_t""$CXXCPP" 1>&6
 
 ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6
-echo "configure:1114: checking for FlexLexer.h" >&5
+echo "configure:1143: checking for FlexLexer.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1119 "configure"
+#line 1148 "configure"
 #include "confdefs.h"
 #include <FlexLexer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1139,7 +1168,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   true
 else
   echo "$ac_t""no" 1>&6
-{ echo "configure: error: can't find flex header. Please install Flex headers correctly" 1>&2; exit 1; }
+echo "configure: warning: can't find flex header. Please install Flex headers correctly" 1>&2
 fi
 
 subdirs="flower"
@@ -1257,7 +1286,9 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "make/out/Configure_variables.make:make/Configure_variables.make.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "make/out/Configure_variables.make:make/Configure_variables.make.in
+    Makefile:make/Toplevel.make.in
+    " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1298,6 +1329,7 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@BISON@%$BISON%g
 s%@FLEX@%$FLEX%g
 s%@TEXPREFIX@%$TEXPREFIX%g
+s%@EXTRA_LIBES@%$EXTRA_LIBES%g
 s%@MAKE@%$MAKE%g
 s%@PODMAN@%$PODMAN%g
 s%@CXXCPP@%$CXXCPP%g
@@ -1343,7 +1375,9 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"make/out/Configure_variables.make:make/Configure_variables.make.in"}
+CONFIG_FILES=\${CONFIG_FILES-"make/out/Configure_variables.make:make/Configure_variables.make.in
+    Makefile:make/Toplevel.make.in
+    "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -1517,7 +1551,7 @@ fi
 eval "DIR_DATADIR=$datadir"
 DIR_DATADIR="$DIR_DATADIR/lilypond"
 echo $ac_n "checking ""... $ac_c" 1>&6
-echo "configure:1521: checking " >&5
+echo "configure:1555: checking " >&5
 
 cat << EOF > lib/out/config.hh
 
@@ -1541,8 +1575,8 @@ sed 's/TOPLEVEL_//g' <  .version >  lily/.version
 )
  (cd flower;
 )
-cat << END
 
+cat << END
 Finished configuring. For making everything, do:
 
        make all

diff --git a/configure.in b/configure.in
index 309488cae9181f8de5d1345e9a61a99de1552d27..f3837945ae1154a4aaf15b08e40242e50bfb7f5f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -38,30 +38,60 @@ AC_INIT(flower/choleski.cc)
 
 
 AC_LANG_CPLUSPLUS
-
+printing_b=no
+checking_b=yes
+debug_b=yes
+optimise_b=no
+profile_b=no
+    
 AC_ARG_ENABLE(printing,
-       [  enable-printing        set debug printing],
-       [],
-       [DEFINES="$DEFINES -DNPRINT=1"])
+    [  enable-printing        set debug printing],
+    [printing_b=$enableval])
+
+       
 AC_ARG_ENABLE(checking,
-       [  disable-checking       set runtime checks],
-       [DEFINES="$DEFINES -DNDEBUG=1"],
-       [])
+    [  disable-checking       set runtime checks],
+    [checking_b=$enableval] )
+
+
+
 AC_ARG_ENABLE(debug,
-       [  disable-debug          set debug info],
-       [],
-       [DEFINES="$DEFINES -g"])
+    [  disable-debug          set debug info],
+    [debug_b=$enableval])
+
 AC_ARG_ENABLE(optimise,
-       [  enable-optimise       use maximal speed optimisations],
-       [DEFINES="$DEFINES -O2 -DSTRING_UTILS_INLINED"])
-AC_ARG_ENABLE(profiling,
-       [  enable-profiling      compile with gprof support],
-       [DEFINES="$DEFINES -pg"])
+    [  enable-optimise       use maximal speed optimisations],
+    [optimise_b=$enableval])
+    
+   
+AC_ARG_ENABLE(profiling, 
+    [  enable-profiling      compile with gprof support],
+    [profile_b=$enableval])
+    
 AC_ARG_ENABLE(texprefix,
-       [  texprefix=DIR  set the tex-directory to put the lilypond subdir in.],
-       [TEXPREFIX=$enableval],
-       [TEXPREFIX=auto] )
+    [  texprefix=DIR  set the tex-directory to put the lilypond subdir in.],
+    [TEXPREFIX=$enableval],
+    [TEXPREFIX=auto] )
+   
+if test $profile_b = yes; then
+    EXTRA_LIBES="-pg"
+    DEFINES="$DEFINES -pg"
+fi
+    
+if test $printing_b = no; then
+    DEFINES="$DEFINES -DNPRINT=1"
+fi
+    
+if test $debug_b = yes; then   
+    DEFINES="$DEFINES -g"
+fi
+if test $checking_b = no; then
+    DEFINES="$DEFINES -DNDEBUG=1"
+fi
 
+if test $optimise_b = yes; then
+    DEFINES="$DEFINES -O2 -DSTRING_UTILS_INLINED"
+fi
 dnl COMPILEINFO="$HOST $host $TARGET $target"
 AUTOHEADER="This file was automatically generated by configure"
 CXXFLAGS=${CXXFLAGS:-""}       # we don't want -g -O junk
@@ -81,7 +111,7 @@ AC_SUBST(AUTOHEADER)
 AC_SUBST(BISON)
 AC_SUBST(FLEX)
 AC_SUBST(TEXPREFIX)
-
+AC_SUBST(EXTRA_LIBES)
 
 AC_CHECK_PROGS(BISON, bison, error)
 AC_CHECK_PROGS(FLEX, flex, error)
@@ -96,7 +126,7 @@ if test $MAKE = "error"
 then
        AC_MSG_ERROR(Please install GNU make)
 else
-       $MAKE -v| grep -q GNU
+       $MAKE -v| grep GNU >& /dev/null
        if test "$?" = 1
        then
                AC_MSG_WARN(Please install *GNU* make)
@@ -119,7 +149,7 @@ then
        AC_MSG_WARN(can't find flex. Please install Flex (2.5 or better))
 fi
 
-if $CXX --version | grep -q '2\.7'
+if $CXX --version | grep '2\.7' >& /dev/null
 then
        true
 else
@@ -127,9 +157,11 @@ else
 fi
 
 AC_CHECK_HEADER(FlexLexer.h, true,
-       AC_MSG_ERROR(can't find flex header. Please install Flex headers correctly))
+       AC_MSG_WARN(can't find flex header. Please install Flex headers correctly))
 AC_CONFIG_SUBDIRS(flower)
-AC_OUTPUT(make/out/Configure_variables.make:make/Configure_variables.make.in)
+AC_OUTPUT(make/out/Configure_variables.make:make/Configure_variables.make.in
+    Makefile:make/Toplevel.make.in
+    )
 
 
 
@@ -158,13 +190,11 @@ dnl    echo 0 > out/.build
 # rgu
 sed 's/TOPLEVEL_//g' <  .version >  lily/.version
 (cd lily; CXX="$ac_cv_prog_CXX" ../bin/make_version > out/version.hh
-dnl    echo 0 > out/.build
 )
  (cd flower;
-dnl    echo 0 > out/.build
 )
-cat << END
 
+cat << END
 Finished configuring. For making everything, do:
 
        make all

diff --git a/lily/.version b/lily/.version
index c74b79390bea349843bc063cfd81e3cd44a2d377..5cb028566e039ed4a6e1957a1a5e6fce2ef6f3b8 100644 (file)
--- a/lily/.version
+++ b/lily/.version
@@ -1,8 +1,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
-PATCH_LEVEL = 44
+PATCH_LEVEL = 45
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf
 
 MY_PATCH_LEVEL =
-#

diff --git a/make/Configure_variables.make.in b/make/Configure_variables.make.in
index e38c13d9b061d0e303b572fd86b3d2be406990e0..35f616267c66e0d1b97893003b8d0561c27e024f 100644 (file)
--- a/make/Configure_variables.make.in
+++ b/make/Configure_variables.make.in
@@ -3,7 +3,8 @@
 # @configure_input@
 
 INSTALL = @INSTALL@
-USER_CXXFLAGS = @CXXFLAGS@
+USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
+
 #CXX = @CXX@
 
 prefix = @prefix@
@@ -13,7 +14,7 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 includedir = @includedir@
 datadir = @datadir@
-
+EXTRA_LIBES = @EXTRA_LIBES@
 RANLIB = @RANLIB@
 DEFS = @DEFS@
 #SET_MAKE = @SET_MAKE@