* bootstrap: Comment out the AM_CPPFLAGS line, since we don't use

that variable and the line breaks the bootstrap.

diff --git a/ChangeLog b/ChangeLog
index 758a5c360c46f9da1a7f6c1b077fe6e2c9fb225c..e2dc04aef13f6d54665530e33e2423c8b8cc9ecb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * bootstrap: Comment out the AM_CPPFLAGS line, since we don't use
+       that variable and the line breaks the bootstrap.  Problem reported
+       by Juan M. Guerrero.
+
 2006-04-24  Akim Demaille  <akim@lrde.epita.fr>
 
        * doc/bison.texinfo (Multiple start-symbols): New.

diff --git a/bootstrap b/bootstrap
index 7c7bd3300e33f0eba634ec35501e2b9b994d1cc9..a52c233e81eaa26bdd5cea5c5869bc7686af1e1f 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -237,7 +237,8 @@ esac
 ) >m4/gnulib.m4 || exit
 
 (echo '# This file is generated automatically by "bootstrap".' &&
- $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_modules
+ $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_modules |
+ sed 's/^[      ]*AM_CPPFLAGS[  ]*+=/# (commented out by bootstrap) &/'
 ) >lib/gnulib.mk || exit