* lexer-gcc-3.1.sh: Fixes and more comments.

* Documentation/topdocs/INSTALL.texi: Add comment about gcc-3.0.4
problems.

diff --git a/ChangeLog b/ChangeLog
index 9826ebd839b91d21264702bb671301507e57df83..3ce8c8c048fb5dd55e9bb9878448031e3a4b1505 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-07-05  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lexer-gcc-3.1.sh: Fixes and more comments.
+
+       * Documentation/topdocs/INSTALL.texi: Add comment about gcc-3.0.4
+       problems.
+
        * lily/include/stream.hh:
        * lily/include/moment.hh:
        * lily/include/midi-stream.hh:

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index a7ced0fd3c38e102faa24e2a29cf6f1bb18847e4..a0f923d636ed1876be993585bf2128e5fdd95c3b 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -623,6 +623,11 @@ send bug reports to @email{bug-lilypond@@gnu.org}.
 
 Bugs that are not fault of LilyPond are documented here.
 
+@unnumberedsubsec Gcc-3.0.4
+
+Gcc 3.0.4, is a bit flaky.  Try downgrading to 2.95.x, or if you're
+adventurous (see below), upgrading to 3.1.x.
+
 @unnumberedsubsec Flex-2.5.4a and gcc-3.x
 
 Flex 2.5.4a does not produce g++-3.0 compliant C++ code.  To compile

diff --git a/lexer-gcc-3.1.sh b/lexer-gcc-3.1.sh
index 7d816302b853f5e61b73b1539129305a575c8fda..944497fdf9f8725323aa1feee97d61ae2e62499a 100755 (executable)
--- a/lexer-gcc-3.1.sh
+++ b/lexer-gcc-3.1.sh
@@ -2,6 +2,8 @@
 #
 # script documenting fixes for flex-2.5.4 and gcc-3.1
 
+set -e
+
 includes="$HOME/usr/include /usr/local/include /usr/include"
 
 for i in $includes; do
@@ -25,7 +27,9 @@ fi
 
 if [ -n "$CONF" ]; then
     CONFIGSUFFIX=-$CONF
-    ENABLECONFIG="--enable-config=$CONF"
+    SETCONF="CONF=$CONF "
+    setconf="conf=$CONF "
+    ENABLECONFIG="--enable-config=$CONF "
 fi    
 outdir=out$CONFIGSUFFIX
 
@@ -38,13 +42,14 @@ sed -e 's/iostream.h/iostream/' \
     $file > lily/$outdir/FlexLexer.h
 echo "done"
 
-file=lily/$outdir/lexer.cc
-rm -f $file
-make conf=$CONF -C lily $outdir/lexer.cc || exit 0
 
-if [ -f "$file" ]; then
+if [ -f GNUmakefile ]; then
     echo -n "Generating and fixing $file... "
 
+    file=lily/$outdir/lexer.cc
+    rm -f $file
+    make conf=$CONF -C lily $outdir/lexer.cc > /dev/null 2>&1 || true
+
     mv $file $file.orig
     sed -e 's/\<cin\>/std::cin/g' \
        -e 's/\<cout\>/std::cout/g' \
@@ -57,7 +62,10 @@ cat <<EOF
 
 Remove config.cache before rerunning ./configure
 
-Reconfigure doing something like:
+Reconfigure, refix, and make doing something like:
 
+    rm -f config.cache
     CPPFLAGS=-I$(pwd)/lily/$outdir ./configure $ENABLECONFIG
+    $SETCONF$0
+    make $setconf
 EOF