build: avoid YACC typo inherited from Autoconf.

The typo shows up in the `configure --help' output.  Reported by
W.C.A. Wijngaards and Paul Eggert at
<http://lists.gnu.org/archive/html/bug-bison/2011-07/msg00000.html>.
* README-hacking (Release Procedure): Remind about updating
maintainer tools before a release.
* THANKS (W.C.A. Wijngaards): Add.
* configure.ac (AC_PREREQ): Set to 2.68, which fixes the YACC
typo.
(cherry picked from commit 845346b3bb526d0f18878f15d906f05205b5c618)

diff --git a/ChangeLog b/ChangeLog
index 48fcbdff9e53b6103e2a261182f0965f019204f2..c9c6d8138c8d0740dc9ff99196d37b6b964a8670 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-07-10  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       build: avoid YACC typo inherited from Autoconf.
+       The typo shows up in the `configure --help' output.  Reported by
+       W.C.A. Wijngaards and Paul Eggert at
+       <http://lists.gnu.org/archive/html/bug-bison/2011-07/msg00000.html>.
+       * README-hacking (Release Procedure): Remind about updating
+       maintainer tools before a release.
+       * THANKS (W.C.A. Wijngaards): Add.
+       * configure.ac (AC_PREREQ): Set to 2.68, which fixes the YACC
+       typo.
+
 2011-07-10  Joel E. Denny  <joeldenny@joeldenny.org>
 
        build: create xz instead of bzip2 tarballs.

diff --git a/README-hacking b/README-hacking
index b334ddc59cad6ad6accf5b2bb087acd49e92d071..6a24062490beab5274eab83d128849494a885470 100644 (file)
--- a/README-hacking
+++ b/README-hacking
@@ -219,6 +219,8 @@ release:
 
 ** Update the submodules.  See above.
 
+** Update maintainer tools, such as Autoconf.  See above.
+
 ** Try to get the *.pot files to the Translation Project at least one
 week before a stable release, to give them time to translate them.
 Before generating the *.pot files, make sure that po/POTFILES.in and

diff --git a/THANKS b/THANKS
index 41c4b55f3ea901f643b5ed5e261f0aa568169364..921b4ef5372075b9bbd6e18627d17bda22ead91f 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -107,6 +107,7 @@ Tommy Nordgren            tommy.nordgren@chello.se
 Troy A. Johnson           troyj@ecn.purdue.edu
 Tys Lefering              twlevo@gmail.com
 Vin Shelton               acs@alumni.princeton.edu
+W.C.A. Wijngaards         wouter@NLnetLabs.nl
 Wayne Green               wayne@infosavvy.com
 Wolfram Wagner            ww@mpi-sb.mpg.de
 Wwp                       subscript@free.fr

diff --git a/configure.ac b/configure.ac
index d0e3df6fc0bc540210352965e44f212d59e04757..d75924e4e30acf95227ca892e71a922a7b6e9bfc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,8 +17,10 @@
 
 # In order for some versions of Sun Studio to compile our C++ test cases
 # correctly, we need Autoconf 2.64 or better to handle the restrict
-# keyword in at least string.h from gnulib.
-AC_PREREQ(2.64)
+# keyword in at least string.h from gnulib.  We need Autoconf 2.68 or
+# better to avoid a typo in the `configure --help' entry for the YACC
+# environment variable.
+AC_PREREQ(2.68)
 
 AC_INIT([GNU Bison],
         m4_esyscmd([build-aux/git-version-gen .tarball-version]),