lilypond-0.1.51

diff --git a/Documentation/faq.pod b/Documentation/faq.pod
index a78f05e8094bc066c1a287058fcf6de5bfd886b5..f3805e91ef3d56c7a54d03d34009d7b623c05cea 100644 (file)
--- a/Documentation/faq.pod
+++ b/Documentation/faq.pod
@@ -357,6 +357,12 @@ LD_LIBRARY_PATH to a directory containing F<libflower.so>
 
 =head2 DOZE
 
+Q: I downloaded the W95 port, and it doesn't match the website!
+
+A: The website is usually made from the latest snapshots.  The W95
+binaries are only made every once in a while.  They can lag several
+versions behind the latest version. 
+
 Q: I want a DOS/NT/W95 port.
 
 A.0: Reconsider.  Try Linux.  It's fun!

diff --git a/bin/Makefile.am.wild b/bin/Makefile.am.wild
index 29e882ac19f5ca9f4d55749cc506af9f3a150d37..fb04a37aeb56763568ac1d32cb71e8d7aae1fa0c 100644 (file)
--- a/bin/Makefile.am.wild
+++ b/bin/Makefile.am.wild
@@ -2,7 +2,8 @@
 
 # bin_SCRIPTS = $(wildcard *.in)
 
+SLANG_SCHRIFTEN = $(wildcard *.py)
 PAREL_SCHRIFTEN = $(wildcard *.pl)
 IN_SCHRIFTEN = $(wildcard *.py)
-EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) wild-perl
+EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFTEN) wild-perl
 

diff --git a/configure b/configure
index 6ee28b62873041c66ed61b1a4eda550b4a177143..0a936113aeb148e42d2ac5ee6d7875618595c3be 100755 (executable)
--- a/configure
+++ b/configure
@@ -25,12 +25,12 @@ ac_help="$ac_help
   enable-printing         turn on debug printing. Default: off"
 ac_help="$ac_help
   enable-checking         set runtime checks (assert calls). Default: on"
-ac_help="$ac_help
-  enable-debugging        set debug info. Default: on"
 ac_help="$ac_help
   enable-optimise         use maximal speed optimisations. Default: off"
 ac_help="$ac_help
   enable-profiling        compile with gprof support. Default: off"
+ac_help="$ac_help
+  enable-debugging        set debug info. Default: on"
 ac_help="$ac_help
   enable-mingw-prefix=DIR        set the mingw32 directory (standalone windows32 exes)"
 ac_help="$ac_help
@@ -1641,81 +1641,13 @@ fi
 # ugh, ugh
 ac_cv_prog_lex_root=lex.yy
 
-missing_dir=`cd $ac_aux_dir && pwd`
-
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:1648: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1661: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1674: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1687: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1700: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
 printing_b=no
 checking_b=yes
-debug_b=yes
 optimise_b=no
 profile_b=no
 
+debug_b=yes
+
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -1731,7 +1663,6 @@ if test "${enable_printing+set}" = set; then
 fi
 
 
-       
 # Check whether --enable-checking or --disable-checking was given.
 if test "${enable_checking+set}" = set; then
   enableval="$enable_checking"
@@ -1739,13 +1670,6 @@ if test "${enable_checking+set}" = set; then
 fi
 
 
-# Check whether --enable-debugging or --disable-debugging was given.
-if test "${enable_debugging+set}" = set; then
-  enableval="$enable_debugging"
-  debug_b=$enableval
-fi
-
-
 # Check whether --enable-optimise or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then
   enableval="$enable_optimise"
@@ -1760,6 +1684,13 @@ if test "${enable_profiling+set}" = set; then
 fi
 
     
+# Check whether --enable-debugging or --disable-debugging was given.
+if test "${enable_debugging+set}" = set; then
+  enableval="$enable_debugging"
+  debug_b=$enableval
+fi
+
+
 # Check whether --enable-mingw-prefix or --disable-mingw-prefix was given.
 if test "${enable_mingw_prefix+set}" = set; then
   enableval="$enable_mingw_prefix"
@@ -1796,21 +1727,37 @@ else
 fi
 
 
+if test "$printing_b" = no; then
+    cat >> confdefs.h <<\EOF
+#define NPRINT 1
+EOF
+
+fi
+    
+if test "$checking_b" = no; then
+    cat >> confdefs.h <<\EOF
+#define NDEBUG 1
+EOF
+
+fi
+
+if test "$optimise_b" = yes; then
+#    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
+    cat >> confdefs.h <<\EOF
+#define STRINGS_UTILS_INLINED 1
+EOF
+
+fi
+
+# oeps, broken for now
 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
 
 # however, C++ support in mingw32 v 0.1.4 is still flaky
 if test x$MINGWPREFIX != xno; then 
@@ -1818,10 +1765,6 @@ if test x$MINGWPREFIX != xno; then
     ILDFLAGS="-$MINGWPREFIX/lib"
 fi
 
-if test $optimise_b = yes; then
-    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
-fi
-
 if test "x$OSTYPE" = "xWindows_NT"; then
     LN=cp # hard link does not work under cygnus-nt (yet?)
     ZIP="zip -r -9" #
@@ -1830,7 +1773,7 @@ else
     ZIP="zip -r -9"
 fi
 
-AUTOHEADER="This file was automatically generated by configure"
+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
 
@@ -1839,7 +1782,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:1843: checking for $ac_word" >&5
+echo "configure:1786: 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
@@ -1870,7 +1813,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1874: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1817: 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.
@@ -1880,11 +1823,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 1884 "configure"
+#line 1827 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1831: \"$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
@@ -1904,12 +1847,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:1908: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1851: 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:1913: checking whether we are using GNU C++" >&5
+echo "configure:1856: 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
@@ -1918,7 +1861,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1922: \"$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:1865: \"$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
@@ -1933,7 +1876,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:1937: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1880: 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
@@ -1972,7 +1915,7 @@ fi
 # 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:1976: checking for a BSD compatible install" >&5
+echo "configure:1919: 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
@@ -2026,7 +1969,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:2030: checking for $ac_word" >&5
+echo "configure:1973: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2060,7 +2003,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:2064: checking for $ac_word" >&5
+echo "configure:2007: 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
@@ -2100,6 +2043,26 @@ test -n "$FIND" || FIND="error"
        fi
 
 
+
+cat >> confdefs.h <<EOF
+#define TOPLEVEL_VERSION "${FULL_VERSION}"
+EOF
+
+# ugh: produces "${prefix}/share/lilypond"
+# DIR_DATADIR=$datadir/lilypond
+# ugh: produces "NONE/share/lilypond"
+# DIR_DATADIR=$prefix/share/lilypond
+
+DIR_DATADIR=$prefix/share/lilypond
+if test x$prefix = xNONE; then
+       DIR_DATADIR=/usr/local/share/lilypond
+fi
+cat >> confdefs.h <<EOF
+#define DIR_DATADIR "${DIR_DATADIR}"
+EOF
+
+
+absolute_builddir="`pwd`"
     
 
 
@@ -2119,6 +2082,7 @@ test -n "$FIND" || FIND="error"
 
 
 
+
 
 
 for ac_prog in bison
@@ -2126,7 +2090,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:2130: checking for $ac_word" >&5
+echo "configure:2094: 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
@@ -2160,7 +2124,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:2164: checking for $ac_word" >&5
+echo "configure:2128: 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
@@ -2194,7 +2158,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:2198: checking for $ac_word" >&5
+echo "configure:2162: 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
@@ -2226,7 +2190,7 @@ test -n "$MAKE" || MAKE="error"
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2230: checking for $ac_word" >&5
+echo "configure:2194: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2258,7 +2222,7 @@ fi
 # Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2262: checking for $ac_word" >&5
+echo "configure:2226: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2292,7 +2256,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:2296: checking for $ac_word" >&5
+echo "configure:2260: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_POD2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2326,7 +2290,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:2330: checking for $ac_word" >&5
+echo "configure:2294: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_POD2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2362,7 +2326,7 @@ if test "x$TEXPREFIX" = xauto ; then
     
 
     echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6
-echo "configure:2366: checking TeX/MF root dir directory" >&5    
+echo "configure:2330: checking TeX/MF root dir directory" >&5    
 
     find_root_prefix="$prefix"
     
@@ -2407,7 +2371,7 @@ if test "x$TEXDIR" = xauto ; then
     
     
     echo $ac_n "checking TeX input directory""... $ac_c" 1>&6
-echo "configure:2411: checking TeX input directory" >&5    
+echo "configure:2375: checking TeX input directory" >&5    
     find_dirdir=`(cd $find_texprefix; 
       $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')`
     
@@ -2523,7 +2487,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:2527: checking how to run the C++ preprocessor" >&5
+echo "configure:2491: 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
@@ -2536,12 +2500,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 2540 "configure"
+#line 2504 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -2561,17 +2525,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:2565: checking for FlexLexer.h" >&5
+echo "configure:2529: 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 2570 "configure"
+#line 2534 "configure"
 #include "confdefs.h"
 #include <FlexLexer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2600,16 +2564,11 @@ fi
 subdirs="flower"
 
 
-cat >> confdefs.h <<EOF
-#define TOPLEVEL_VERSION "${FULL_VERSION}"
-EOF
-
-
 touch lib/stamp-h.in
+# AM_CONFIG_HEADER(lib/config.hh:lib/config.hh.in)
 
 
 
-echo \#define TOPLEVEL_VERSION \"$FULL_VERSION\" >> lib/config.hh
 
 # first do Foobar/Makefile then Foobar/include/Makefile
 trap '' 1 2 15
@@ -2722,7 +2681,7 @@ trap 'rm -fr `echo "bin/Makefile lib/Makefile lib/include/Makefile lily/Makefile
        bin/convert-mudela bin/cvm bin/find-typenames bin/foo bin/genheader
        bin/ly2dvi bin/make-docxx bin/make-examples bin/make-patch
        bin/make-version bin/make-website bin/mf-deps bin/mf-to-table
-       bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest lib/config.hh:lib/config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+       bin/mudela-book bin/ps-to-gifs bin/release bin/show-latest lib/config.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2786,6 +2745,7 @@ s%@ICFLAGS@%$ICFLAGS%g
 s%@ILDFLAGS@%$ILDFLAGS%g
 s%@DEFINES@%$DEFINES%g
 s%@COMPILEINFO@%$COMPILEINFO%g
+s%@AUTOGENERATE@%$AUTOGENERATE%g
 s%@BISON@%$BISON%g
 s%@FLEX@%$FLEX%g
 s%@LN@%$LN%g
@@ -2796,6 +2756,7 @@ s%@TEXPREFIX@%$TEXPREFIX%g
 s%@TEXDIR@%$TEXDIR%g
 s%@MFDIR@%$MFDIR%g
 s%@DIR_DATADIR@%$DIR_DATADIR%g
+s%@absolute_builddir@%$absolute_builddir%g
 s%@EXTRA_LIBES@%$EXTRA_LIBES%g
 s%@MAKE@%$MAKE%g
 s%@POD2HTML@%$POD2HTML%g
@@ -2933,7 +2894,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="lib/config.hh:lib/config.hh.in"
+  CONFIG_HEADERS="lib/config.hh:config.hh.in"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi

diff --git a/configure.in b/configure.in
index 34ca2af321084bc7f3084e06956c7be94e631199..56567a0a0d4212604f023f01586422e8411cbcae 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
 dnl -*-shell-script-*-
 dnl  Process this file with autoconf to produce a configure script. 
 
+
 AC_INIT(flower/choleski.cc)
 
 . $srcdir/VERSION
@@ -27,36 +28,23 @@ AC_DECL_YYTEXT
 # ugh, ugh
 ac_cv_prog_lex_root=lex.yy
 
-missing_dir=`cd $ac_aux_dir && pwd`
-
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-
-
 printing_b=no
 checking_b=yes
-debug_b=yes
 optimise_b=no
 profile_b=no
 
+debug_b=yes
+
 AC_LANG_CPLUSPLUS
 
 AC_ARG_ENABLE(printing,
     [  enable-printing         turn on debug printing. Default: off],
     [printing_b=$enableval])
 
-       
 AC_ARG_ENABLE(checking,
     [  enable-checking         set runtime checks (assert calls). Default: on],
     [checking_b=$enableval] )
 
-AC_ARG_ENABLE(debugging,
-    [  enable-debugging        set debug info. Default: on],
-    [debug_b=$enableval])
-
 AC_ARG_ENABLE(optimise,
     [  enable-optimise         use maximal speed optimisations. Default: off],
     [optimise_b=$enableval])
@@ -65,6 +53,10 @@ AC_ARG_ENABLE(profiling,
     [  enable-profiling        compile with gprof support. Default: off],
     [profile_b=$enableval])
     
+AC_ARG_ENABLE(debugging,
+    [  enable-debugging        set debug info. Default: on],
+    [debug_b=$enableval])
+
 AC_ARG_ENABLE(mingw-prefix,
     [  enable-mingw-prefix=DIR        set the mingw32 directory (standalone windows32 exes)],
     [MINGWPREFIX=$enableval],
@@ -85,21 +77,28 @@ AC_ARG_ENABLE(mf-dir,
      [MFDIR=$enableval],
      [MFDIR=auto])
 
+if test "$printing_b" = no; then
+    AC_DEFINE(NPRINT)
+fi
+    
+if test "$checking_b" = no; then
+    AC_DEFINE(NDEBUG)
+fi
+
+if test "$optimise_b" = yes; then
+#    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
+    AC_DEFINE(STRINGS_UTILS_INLINED)
+fi
+
+# oeps, broken for now
 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
 
 # however, C++ support in mingw32 v 0.1.4 is still flaky
 if test x$MINGWPREFIX != xno; then 
@@ -107,10 +106,6 @@ if test x$MINGWPREFIX != xno; then
     ILDFLAGS="-$MINGWPREFIX/lib"
 fi
 
-if test $optimise_b = yes; then
-    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
-fi
-
 if test "x$OSTYPE" = "xWindows_NT"; then
     LN=cp # hard link does not work under cygnus-nt (yet?)
     ZIP="zip -r -9" #
@@ -120,7 +115,7 @@ else
 fi
 
 dnl COMPILEINFO="$HOST $host $TARGET $target"
-AUTOHEADER="This file was automatically generated by configure"
+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
 
@@ -133,6 +128,20 @@ AC_CHECK_PROGS(FIND, find, error)
 dnl should check out -print
 AC_CHECK_SEARCH_RESULT($FIND, \`find\'. Please use --enable-tex-dir)
 
+
+AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
+# ugh: produces "${prefix}/share/lilypond"
+# DIR_DATADIR=$datadir/lilypond
+# ugh: produces "NONE/share/lilypond"
+# DIR_DATADIR=$prefix/share/lilypond
+
+DIR_DATADIR=$prefix/share/lilypond
+if test x$prefix = xNONE; then
+       DIR_DATADIR=/usr/local/share/lilypond
+fi
+AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}")
+
+absolute_builddir="`pwd`"
     
 AC_SUBST(CXXFLAGS)
 AC_SUBST(CPPFLAGS)
@@ -141,7 +150,7 @@ AC_SUBST(ICFLAGS)
 AC_SUBST(ILDFLAGS)
 AC_SUBST(DEFINES)
 AC_SUBST(COMPILEINFO)
-AC_SUBST(AUTOHEADER)
+AC_SUBST(AUTOGENERATE)
 AC_SUBST(BISON)
 AC_SUBST(FLEX)
 AC_SUBST(LN)
@@ -152,6 +161,7 @@ AC_SUBST(TEXPREFIX)
 AC_SUBST(TEXDIR)
 AC_SUBST(MFDIR)
 AC_SUBST(DIR_DATADIR)
+AC_SUBST(absolute_builddir)
 AC_SUBST(EXTRA_LIBES)
 
 AC_CHECK_PROGS(BISON, bison, error)
@@ -222,11 +232,9 @@ AC_CHECK_HEADER(FlexLexer.h, true,
 
 AC_CONFIG_SUBDIRS(flower)
 
-AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
-
 touch lib/stamp-h.in
-AM_CONFIG_HEADER(lib/config.hh:lib/config.hh.in)
-echo \#define TOPLEVEL_VERSION \"$FULL_VERSION\" >> lib/config.hh
+# AM_CONFIG_HEADER(lib/config.hh:lib/config.hh.in)
+AM_CONFIG_HEADER(lib/config.hh:config.hh.in)
 
 # first do Foobar/Makefile then Foobar/include/Makefile
 AC_OUTPUT(bin/Makefile lib/Makefile lib/include/Makefile lily/Makefile

diff --git a/flower/configure b/flower/configure
index c0a704a5d72b077276e4efbce6bb97335ceba6c2..e9c9cd70dd727e9ae065c17a154648a1bc0f8da0 100644 (file)
--- a/flower/configure
+++ b/flower/configure
@@ -21,6 +21,14 @@ ac_help="$ac_help
                           appears as an element in the PKGS list"
 ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
+ac_help="$ac_help
+  enable-printing         turn on debug printing. Default: off"
+ac_help="$ac_help
+  enable-checking         set runtime checks (assert calls). Default: on"
+ac_help="$ac_help
+  enable-optimise         use maximal speed optimisations. Default: off"
+ac_help="$ac_help
+  enable-profiling        compile with gprof support. Default: off"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -564,7 +572,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:568: checking for a BSD compatible install" >&5
+echo "configure:576: 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
@@ -617,7 +625,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:621: checking whether build environment is sane" >&5
+echo "configure:629: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -674,7 +682,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:678: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:686: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -720,7 +728,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:724: checking for working aclocal" >&5
+echo "configure:732: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -733,7 +741,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:737: checking for working autoconf" >&5
+echo "configure:745: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -746,7 +754,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:750: checking for working automake" >&5
+echo "configure:758: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -759,7 +767,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:763: checking for working autoheader" >&5
+echo "configure:771: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -772,7 +780,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:776: checking for working makeinfo" >&5
+echo "configure:784: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -789,7 +797,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:793: checking for $ac_word" >&5
+echo "configure:801: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -818,7 +826,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:822: checking for $ac_word" >&5
+echo "configure:830: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -866,7 +874,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:870: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:878: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -876,11 +884,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 880 "configure"
+#line 888 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -900,12 +908,12 @@ if test $ac_cv_prog_cc_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 ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:904: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:912: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:909: checking whether we are using GNU C" >&5
+echo "configure:917: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -914,7 +922,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -929,7 +937,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:933: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:941: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -961,7 +969,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:965: checking for $ac_word" >&5
+echo "configure:973: 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
@@ -992,7 +1000,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:996: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1004: 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.
@@ -1002,11 +1010,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 1006 "configure"
+#line 1014 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1018: \"$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
@@ -1032,12 +1040,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:1036: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1044: 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:1041: checking whether we are using GNU C++" >&5
+echo "configure:1049: 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
@@ -1046,7 +1054,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1050: \"$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:1058: \"$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
@@ -1061,7 +1069,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:1065: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1073: 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
@@ -1089,6 +1097,7 @@ else
 fi
 
 
+
 # turn off shared libraries by default (may be enabled using --enable-shared)
 # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
@@ -1143,7 +1152,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1147: checking host system type" >&5
+echo "configure:1156: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1166,7 +1175,7 @@ echo "$ac_t""$host" 1>&6
 # 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:1170: checking for $ac_word" >&5
+echo "configure:1179: 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
@@ -1205,7 +1214,7 @@ ac_prog=ld
 if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1209: checking for ld used by GCC" >&5
+echo "configure:1218: checking for ld used by GCC" >&5
   ac_prog=`($CC -print-prog-name=ld) 2>&5`
   case "$ac_prog" in
   # Accept absolute paths.
@@ -1223,10 +1232,10 @@ echo "configure:1209: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1227: checking for GNU ld" >&5
+echo "configure:1236: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1230: checking for non-GNU ld" >&5
+echo "configure:1239: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1262,7 +1271,7 @@ fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1266: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1275: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1278,7 +1287,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1282: checking for BSD-compatible nm" >&5
+echo "configure:1291: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1315,7 +1324,7 @@ echo "$ac_t""$NM" 1>&6
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1319: checking whether ln -s works" >&5
+echo "configure:1328: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1351,8 +1360,8 @@ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1355 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1364 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1382,95 +1391,66 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 
+printing_b=no
+checking_b=yes
+optimise_b=no
+profile_b=no
 
-missing_dir=`cd $ac_aux_dir && pwd`
-
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:1390: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
+# Check whether --enable-printing or --disable-printing was given.
+if test "${enable_printing+set}" = set; then
+  enableval="$enable_printing"
+  printing_b=$enableval
 fi
 
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1403: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
+
+# Check whether --enable-checking or --disable-checking was given.
+if test "${enable_checking+set}" = set; then
+  enableval="$enable_checking"
+  checking_b=$enableval 
 fi
 
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1416: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
+
+# Check whether --enable-optimise or --disable-optimise was given.
+if test "${enable_optimise+set}" = set; then
+  enableval="$enable_optimise"
+  optimise_b=$enableval
 fi
 
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1429: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
+    
+# Check whether --enable-profiling or --disable-profiling was given.
+if test "${enable_profiling+set}" = set; then
+  enableval="$enable_profiling"
+  profile_b=$enableval
 fi
 
-# AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1445: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$PERL" in
-  /*)
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PERL="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="error"
-  ;;
-esac
+    
+if test $printing_b = no; then
+    cat >> confdefs.h <<\EOF
+#define NPRINT 1
+EOF
+
 fi
-PERL="$ac_cv_path_PERL"
-if test -n "$PERL"; then
-  echo "$ac_t""$PERL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+    
+if test $checking_b = no; then
+    cat >> confdefs.h <<\EOF
+#define NDEBUG 1
+EOF
+
 fi
 
+if test $optimise_b = yes; then
+#    DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED"
+    cat >> confdefs.h <<\EOF
+#define STRINGS_UTILS_INLINED 1
+EOF
 
+fi
+
+# oeps, broken for now
+if test $profile_b = yes; then
+    EXTRA_LIBES="-pg"
+    DEFINES="$DEFINES -pg"
+fi
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1480,15 +1460,9 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
 
 
-# optimise_b=yes
-# shared_b=no
 LIB_SUFFIX=.a
 MODULE_CXXFLAGS="$MODULE_CXXFLAGS -D_REENTRANT"
 
-if test $optimise_b = yes; then
-    MODULE_CXXFLAGS="$MODULE_CXXFLAGS -O2 -DSTRING_UTILS_INLINED"
-fi
-
 
 
 
@@ -1506,7 +1480,7 @@ fi
 
 REVISION=$PATCH_LEVEL
 # CURRENT=$MINOR_VERSION
-CURRENT=$(expr $MINOR_VERSION + 1)
+CURRENT=`expr $MINOR_VERSION + 1`
 # AGE=$(expr $MAJOR_VERSION + 1)
 AGE=$MAJOR_VERSION
 
@@ -1515,7 +1489,7 @@ AGE=$MAJOR_VERSION
 
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:1519: checking for 8-bit clean memcmp" >&5
+echo "configure:1493: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1523,7 +1497,7 @@ else
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 1527 "configure"
+#line 1501 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -1536,7 +1510,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -1554,12 +1528,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1558: checking for vprintf" >&5
+echo "configure:1532: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1563 "configure"
+#line 1537 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -1585,7 +1559,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -1609,12 +1583,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1613: checking for _doprnt" >&5
+echo "configure:1587: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1618 "configure"
+#line 1592 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -1640,7 +1614,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -1667,12 +1641,12 @@ fi
 for ac_func in memmem snprintf 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1671: checking for $ac_func" >&5
+echo "configure:1645: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1676 "configure"
+#line 1650 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1698,7 +1672,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1886,13 +1860,13 @@ s%@LD@%$LD%g
 s%@NM@%$NM%g
 s%@LN_S@%$LN_S%g
 s%@LIBTOOL@%$LIBTOOL%g
-s%@PERL@%$PERL%g
 s%@MODULE_CXXFLAGS@%$MODULE_CXXFLAGS%g
 s%@MODULE_LDFLAGS@%$MODULE_LDFLAGS%g
 s%@LIB_SUFFIX@%$LIB_SUFFIX%g
 s%@CURRENT@%$CURRENT%g
 s%@REVISION@%$REVISION%g
 s%@AGE@%$AGE%g
+s%@PERL@%$PERL%g
 s%@LIBOBJS@%$LIBOBJS%g
 
 CEOF

diff --git a/lily/Makefile.am.wild b/lily/Makefile.am.wild
index 10a242b8df21944318cffb6673b2b17c4ec11270..b7584ca7bfeed32006bbdddf1d70a67875c5a022 100644 (file)
--- a/lily/Makefile.am.wild
+++ b/lily/Makefile.am.wild
@@ -15,13 +15,17 @@ nowildcard: lexer.cc parser.cc
 lilypond_SOURCES = $(wildcard *.cc *.ll *.yy)
 noinst_HEADERS = parser.hh
 
-lilypond_LDADD = -llily -lflower @LEXLIB@
+#lilypond_LDADD = -llily -lflower @LEXLIB@
+lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
 
-lilypond_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs
+lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
+
+
+ 
 
 INCLUDES =  -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include 
 
-EXTRA_DIST = Makefile.am.wild Stable.make VERSION
+EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION
 
 # force these: Make can't know these have to be generated in advance
 my-lily-lexer.cc: parser.hh
@@ -36,15 +40,10 @@ parser.hh: parser.yy
        $(BISON) -d $<
        mv $<.tab.h $@
        mv $<.tab.c $(shell basename $@ .hh).cc
-# .ll.cc:
-# ugh, stupid automake 
-# now set output root by hand...
-#      touch lex.yy.cc
-
-# .yy.cc:
-#      $(BISON) $<
-#      mv $(shell basename $@ .cc ).tab.c $@
-#      $(FLEX) -Cfe -p -p -t $< > $@
-# # could be faster:
-# #    $(FLEX) -8 -Cf -t $< > $@
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
 

diff --git a/mi2mu/Makefile.am.wild b/mi2mu/Makefile.am.wild
index b4494f9436b901ba3eba541a5fb31de99e197364..46079471217638afc04c67c4aefabccf59165488 100644 (file)
--- a/mi2mu/Makefile.am.wild
+++ b/mi2mu/Makefile.am.wild
@@ -13,11 +13,18 @@ bin_PROGRAMS = mi2mu
 mi2mu_SOURCES = $(wildcard *.cc)
 
 # ugh -lfl bo lib/FlexLexer stuff
-mi2mu_LDADD = -llily -lflower -lfl
+#mi2mu_LDADD = -llily -lflower -lfl
 
-mi2mu_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs
+# mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
+mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
+ 
 
 INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include
 
-EXTRA_DIST = Makefile.am.wild VERSION TODO
+EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO
 
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check: