* lexer-gcc-3.0.patch: Remove.

* lexer-gcc-3.1.sh: Disable FlexLexer.h massaging.

diff --git a/ChangeLog b/ChangeLog
index 3a1c0dc0a14b81063f18f7ab9c89c2f6f80012ec..43200ed62c3ed621f9067177587794a7cb1932a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-30  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lexer-gcc-3.0.patch: Remove.
+
+       * lexer-gcc-3.1.sh: Disable FlexLexer.h massaging.
+
 2003-07-30  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * debian/rules (binary-arch): remove NEWS.

diff --git a/lexer-gcc-3.0.patch b/lexer-gcc-3.0.patch
deleted file mode 100644 (file)
index 00e1ccc..0000000
--- a/lexer-gcc-3.0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Patch file documenting fix for flex-2.5.4 and gcc-3.x
-#
-# For usage of this patch, see INSTALL.txt
-
---- ./lily/out-gcc-3.0/lexer.cc~       Tue Jun 26 13:12:26 2001
-+++ ./lily/out-gcc-3.0/lexer.cc        Tue Jun 26 13:11:56 2001
-@@ -21,7 +21,7 @@
- #ifdef __cplusplus
- 
- #include <stdlib.h>
--class istream;
-+#include <iostream>
- #include <unistd.h>
- 
- /* Use prototypes in function declarations. */

diff --git a/lexer-gcc-3.1.sh b/lexer-gcc-3.1.sh
index 944497fdf9f8725323aa1feee97d61ae2e62499a..c9b8a389d64bb86040c8857a37b12f37f541f7f3 100755 (executable)
--- a/lexer-gcc-3.1.sh
+++ b/lexer-gcc-3.1.sh
@@ -4,6 +4,10 @@
 
 set -e
 
+FLEXLEXER=OK
+
+if [ -z "$FLEXLEXER" ]; then
+
 includes="$HOME/usr/include /usr/local/include /usr/include"
 
 for i in $includes; do
@@ -24,6 +28,7 @@ EOF
     exit 1
 fi
 
+fi # flexlexer
 
 if [ -n "$CONF" ]; then
     CONFIGSUFFIX=-$CONF
@@ -33,6 +38,8 @@ if [ -n "$CONF" ]; then
 fi    
 outdir=out$CONFIGSUFFIX
 
+if [ -z "$FLEXLEXER" ]; then
+
 echo -n "Copying and fixing $file... "
 mkdir -p lily/$outdir
 rm -f lily/$outdir/FlexLexer.h
@@ -42,11 +49,11 @@ sed -e 's/iostream.h/iostream/' \
     $file > lily/$outdir/FlexLexer.h
 echo "done"
 
+fi # flexlexer
 
 if [ -f GNUmakefile ]; then
-    echo -n "Generating and fixing $file... "
-
     file=lily/$outdir/lexer.cc
+    echo -n "Generating and fixing $file... "
     rm -f $file
     make conf=$CONF -C lily $outdir/lexer.cc > /dev/null 2>&1 || true