Version 1.29c.

* tests/regression.at (Invalid CPP headers): New.
From Alexander Belopolsky. * src/files.c (compute_header_macro): Map non alnum chars to `_'.
2026-08-09 02:35:15 +00:00 · 2001-10-02 16:23:59 +00:00 · 2001-10-02 16:17:41 +00:00 · 2001-10-02 15:52:24 +00:00 · 2001-10-02 15:36:11 +00:00 · 2001-10-02 14:48:53 +00:00
74 changed files with 965 additions and 539 deletions
@@ -164,124 +164,128 @@ Available Packages
 ==================

   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of July
+matrix shows the current state of internationalization, as of September
 2001.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.

-     Ready PO files    bg cs da de el en eo es et fi fr gl he hr id it
-                     +-------------------------------------------------+
-     a2ps            |          []             []                      |
-     bash            |          []       [] []       []                |
-     bfd             |                                                 |
-     binutils        |                                                 |
-     bison           |          []          [] []    []                |
-     clisp           |          []    []    []       []                |
-     cpio            |       [] []          []       [] []             |
-     diffutils       |       [] []       [] []       [] []       []    |
-     enscript        |          []                   []                |
-     error           |                      []       []                |
-     fetchmail       |                                                 |
-     fileutils       |    [] [] [] []       []       [] []             |
-     findutils       |       [] []          [] []    [] []       [] [] |
-     flex            |       []             []       []                |
-     freetype        |                                                 |
-     gas             |                                                 |
-     gawk            |                                     []          |
-     gcal            |                                                 |
-     gcc             |                                                 |
-     gettext         |    [] [] [] []       []       [] []       [] [] |
-     gnupg           |          []       []    []    [] []          [] |
-     gprof           |                                                 |
-     grep            |          []       [] [] []    [] []          [] |
-     hello           |       [] [] []    [] [] [] [] [] []          [] |
-     id-utils        |       [] []                   []                |
-     indent          |       [] []             []    [] []             |
-     jpilot          |                               []                |
-     kbd             |                                                 |
-     ld              |                                                 |
-     libc            |    [] [] [] []       []       [] []          [] |
-     lilypond        |                                                 |
-     lynx            |    [] [] []                                     |
-     m4              |    [] [] [] []                [] []       []    |
-     make            |       [] []          []       [] []             |
-     nano            |                                  []       []    |
-     opcodes         |                                                 |
-     parted          |          []                      []             |
-     ptx             |       [] []          [] []    [] []       []    |
-     python          |                                                 |
-     recode          |       [] [] []    [] []       [] [] []       [] |
-     sed             |    [] [] [] []    []    []    [] []       [] [] |
-     sh-utils        |    [] [] [] []       [] []    [] []          [] |
-     sharutils       |    [] [] [] []       []       [] []             |
-     soundtracker    |                                  []             |
-     sp              |                                                 |
-     tar             |    [] [] []          [] []    []          [] [] |
-     texinfo         |    [] [] []       []          []                |
-     textutils       |    [] [] [] []       []       [] []             |
-     util-linux      |    [] []                                        |
-     wdiff           |          []             []                      |
-     wget            |    [] [] [] []       [] []    [] [] []          |
-                     +-------------------------------------------------+
-                       bg cs da de el en eo es et fi fr gl he hr id it
-                        0 13 23 30 11  1  8 21 13  1 29 22  3  0  8 10
+     Ready PO files    bg cs da de el en eo es et fi fr gl he hr id it ja
+                     +----------------------------------------------------+
+     a2ps            |          []             []    []                   |
+     bash            |          []       [] []       []                   |
+     bfd             |                                                    |
+     binutils        |                               []                   |
+     bison           |          []          [] []    []                [] |
+     clisp           |          []    []    []       []                   |
+     cpio            |       [] []          []       [] []                |
+     diffutils       |       [] []       [] []       [] []       []       |
+     enscript        |          []                   []                   |
+     error           |                      []       []                   |
+     fetchmail       |                                                    |
+     fileutils       |    [] [] [] []       []       [] []             [] |
+     findutils       |       [] []          [] []    [] []       [] []    |
+     flex            |       []             []       []                   |
+     freetype        |                                                    |
+     gas             |                                                    |
+     gawk            |                               []    []             |
+     gcal            |                                                    |
+     gcc             |                                                    |
+     gettext         |    [] [] [] []       []       [] []       [] [] [] |
+     gnupg           |          []       []    []    [] []          [] [] |
+     gprof           |                                                    |
+     grep            |    []    []       [] [] []    [] []          []    |
+     hello           |       [] [] []    [] [] [] [] [] []          [] [] |
+     id-utils        |       [] []                   []                   |
+     indent          |       [] []             []    [] []                |
+     jpilot          |                               []                   |
+     kbd             |                                                    |
+     ld              |                               []                   |
+     libc            |    [] [] [] []       []       [] []             [] |
+     lilypond        |                                                 [] |
+     lynx            |    [] [] []                                     [] |
+     m4              |    [] [] [] []                [] []       []    [] |
+     make            |       [] []          []       [] []             [] |
+     mysecretdiary   |          []                                        |
+     nano            |                      []          []       []       |
+     opcodes         |                                                    |
+     parted          |          []                      []             [] |
+     ptx             |       [] []          [] []    [] []       []       |
+     python          |                                                    |
+     recode          |       [] [] []    [] []       [] [] []       []    |
+     sed             |    [] [] [] []    []    []    [] [] []    [] [] [] |
+     sh-utils        |    [] [] [] []       [] []    [] []          [] [] |
+     sharutils       |    [] [] [] []       []       [] []             [] |
+     sketch          |                                                    |
+     soundtracker    |          []          []          []                |
+     sp              |                                                    |
+     tar             |    [] [] []          [] []    []             [] [] |
+     texinfo         |    [] [] []       []          []                [] |
+     textutils       |    [] [] [] []       []       [] []             [] |
+     util-linux      |    [] []                                           |
+     wdiff           |       [] []             []                         |
+     wget            |    [] [] [] []       [] []    [] [] []          [] |
+                     +----------------------------------------------------+
+                       bg cs da de el en eo es et fi fr gl he hr id it ja
+                        0 14 24 32 11  1  8 23 13  1 33 22  4  0  7  9 18
     
-                       ja ko lv nl no pl pt pt_BR ru sk sl sv tr uk zh
-                     +-------------------------------------------------+
-     a2ps            |          []                []    []             |  5
-     bash            |                                                 |  4
-     bfd             |                                                 |  0
-     binutils        |                                                 |  0
-     bison           | []       []                []                   |  7
-     clisp           |          []                                     |  5
-     cpio            |    []    []    []     []   []                   | 10
-     diffutils       |                []          []       []          | 10
-     enscript        |          []           []   []                   |  5
-     error           |                                        []       |  3
-     fetchmail       |                                                 |  0
-     fileutils       | [] []    []    []     []   [] [] [] [] []       | 17
-     findutils       |    []    []    []     []   []    [] [] []       | 16
-     flex            |    []                      []       []          |  6
-     freetype        |                                                 |  0
-     gas             |                                                 |  0
-     gawk            |                                        []       |  2
-     gcal            |                                                 |  0
-     gcc             |                                                 |  0
-     gettext         | [] []          []     []   []    [] [] []    [] | 18
-     gnupg           | []             []                   [] []       | 10
-     gprof           |                                                 |  0
-     grep            |                []                []    []       | 10
-     hello           | [] [] [] [] [] []          [] []    [] [] []    | 21
-     id-utils        |          []                []       []          |  6
-     indent          |    []    []    []          [] []    [] []       | 12
-     jpilot          |                                                 |  1
-     kbd             |                                        []       |  1
-     ld              |                                                 |  0
-     libc            | [] []    [] [] []     []      []    [] []       | 17
-     lilypond        | []       []                                     |  2
-     lynx            | []       []           []   []       []          |  8
-     m4              | []       []    []          []       []          | 12
-     make            | [] []    []    []     []   []          []       | 12
-     nano            |                                     []          |  3
-     opcodes         |                                                 |  0
-     parted          | []       []                []                   |  5
-     ptx             |          [] [] [] []       []       [] []       | 14
-     python          |                                                 |  0
-     recode          |                []          []    [] []          | 13
-     sed             | []       []           []   [] [] [] [] []       | 18
-     sh-utils        | []       [] [] []     []   [] [] [] [] []    [] | 20
-     sharutils       | []       []                []       []          | 11
-     soundtracker    |                                                 |  1
-     sp              |                                                 |  0
-     tar             | []       [] [] []     []   []    [] [] []       | 17
-     texinfo         | []                         []                   |  7
-     textutils       | []       [] [] []     []   [] [] []             | 15
-     util-linux      |                       []               []       |  4
-     wdiff           |                            [] []       []       |  5
-     wget            |          []                [] [] [] [] [] []    | 16
-                     +-------------------------------------------------+
-       31 teams        ja ko lv nl no pl pt pt_BR ru sk sl sv tr uk zh
-       51 domains      17  9  1 23  6 17  1  13   26  9 11 20 19  2  2  369
+                       ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
+                     +----------------------------------------------------+
+     a2ps            |          []                   []    []             |  6
+     bash            |                                                    |  4
+     bfd             |                                                    |  0
+     binutils        |                                                    |  1
+     bison           |                               []                   |  6
+     clisp           |          []                                        |  5
+     cpio            | []       []       []     []   []                   | 10
+     diffutils       |                   []          []       [] []       | 11
+     enscript        |          []              []   []                   |  5
+     error           |                                  []       []       |  4
+     fetchmail       |                                                    |  0
+     fileutils       | []       []       []     []   [] [] [] [] []       | 17
+     findutils       | []       []       []     []   []    [] [] []       | 16
+     flex            | []                            []       []          |  6
+     freetype        |                                                    |  0
+     gas             |                                                    |  0
+     gawk            |                                           []       |  3
+     gcal            |                                                    |  0
+     gcc             |                                                    |  0
+     gettext         | []                []     []   []    [] [] []    [] | 18
+     gnupg           |                   []                   [] []       | 10
+     gprof           |                                                    |  0
+     grep            |                   []                [] [] []       | 12
+     hello           | [] [] [] []    [] []          [] []    [] [] []    | 22
+     id-utils        |          []                   []       []          |  6
+     indent          | []       []       []          [] []    [] []       | 12
+     jpilot          |                                                    |  1
+     kbd             |                                           []       |  1
+     ld              |                                                    |  1
+     libc            | []    []       [] []     []      []    [] []       | 16
+     lilypond        |          []                            []          |  3
+     lynx            |          []              []   []       []          |  8
+     m4              |          []       []          []       []          | 12
+     make            | []       []       []     []   []          []       | 12
+     mysecretdiary   |                                                    |  1
+     nano            |                                        []          |  4
+     opcodes         |                                           []       |  1
+     parted          |          []                   []                   |  5
+     ptx             |       [] []    [] [] []       []       [] []       | 15
+     python          |                                                    |  0
+     recode          |                   []          []    [] []          | 13
+     sed             |          []              []   [] [] [] [] []       | 19
+     sh-utils        |       [] []    [] []     []   [] [] [] [] []    [] | 21
+     sharutils       |          []                   []       []          | 11
+     sketch          |                                                    |  0
+     soundtracker    |                                                    |  3
+     sp              |                                                    |  0
+     tar             |       []       [] []     []         [] [] []       | 15
+     texinfo         |                               []                   |  7
+     textutils       |       [] []    [] []     []   [] [] []             | 16
+     util-linux      |                          []               []       |  4
+     wdiff           |                               [] []    [] []       |  7
+     wget            |          []                   [] [] [] [] [] []    | 17
+                     +----------------------------------------------------+
+       33 teams        ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
+       53 domains       9  1  6 20  0  6 17  1  13   25 10 11 23 21  2  2  387

   Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -294,9 +298,9 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.

-   If July 2001 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
-matrix with full percentage details can be found at
+   If September 2001 seems to be old, you may fetch a more recent copy
+of this `ABOUT-NLS' file on most GNU archive sites.  The most
+up-to-date matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.

 Using `gettext' in new packages
@@ -304,10 +308,11 @@ Using `gettext' in new packages

   If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
-package.  Of course the GNU General Public License applies to your
-sources from then on if you include `gettext' directly in your
-distribution but since you are writing free software anyway this is no
-restriction.
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.

   Once the sources are changed appropriately and the setup can handle
 to use of `gettext' the only thing missing are the translations.  The
@@ -1,3 +1,76 @@
+2001-10-02  Akim Demaille  <[email protected]>
+
+	Version 1.29c.
+
+2001-10-02  Akim Demaille  <[email protected]>
+
+	* tests/regression.at (Invalid CPP headers): New.
+	From Alexander Belopolsky.
+	* src/files.c (compute_header_macro): Map non alnum chars to `_'.
+
+2001-10-02  Akim Demaille  <[email protected]>
+
+	* tests/regression.at (Invalid input): New.
+	* src/lex.c (lex): Be sure to set `token_buffer' in any case.
+	Reported by Shura.
+
+2001-10-02  Akim Demaille  <[email protected]>
+
+	* tests/calc.at: Now that --debug works, the tests must be adjusted.
+
+2001-10-02  Akim Demaille  <[email protected]>
+
+	* src/output.c (output_parser): Assert `skeleton'.
+	* src/files.c (skeleton_find): Look harder for skeletons on DOSish
+	systems.
+	From Shura.
+
+2001-10-01  Marc Autret  <[email protected]>
+
+	* src/lex.h: Echo modifications.
+	* src/lex.c (unlex): Parameter is now token_t.
+	From Hans Aberg.
+
+2001-10-01  Marc Autret  <[email protected]>
+
+	* src/main.c: Include lex.h.
+	From Hans Aberg.
+
+2001-09-29  Akim Demaille  <[email protected]>
+
+	* src/getargs.c (longopts): `--debug' is `-t', not `-d'.
+
+2001-09-28  Akim Demaille  <[email protected]>
+
+	* tests/testsuite.at: Update to newer Autotest.
+	* tests/Makefile.am (EXTRA_DIST): bison is not to be shipped.
+
+2001-09-27  Akim Demaille  <[email protected]>
+
+	Position independent wrapper.
+
+	* tests/bison: Remove.
+	* tests/bison.in: New.
+	* configure.in: Adjust.
+
+2001-09-27  Paul Eggert  <[email protected]>
+
+	Port quotearg fixes from tar 1.13.24.
+
+	* lib/quotearg.c: BSD/OS 4.1 wchar.h requires FILE and struct
+	tm to be declared.
+	(HAVE_MBSINIT): Undef if !HAVE_MBRTOWC.
+	(mbsinit): Define to 1 if !defined mbsinit && !HAVE_MBSINIT.
+
+	* m4/Makefile.am (EXTRA_DIST): Add mbrtowc.m4.
+	* m4/mbrtowc.m4: New file.
+	* m4/prereq.m4 (jm_PREREQ_QUOTEARG): Check for mbsinit and stddef.h.
+	Use jm_FUNC_MBRTOWC instead of AC_CHECK_FUNCS(mbrtowc).
+
+2001-09-27  Akim Demaille  <[email protected]>
+
+	Bump to 1.29c.
+
 2001-09-27  Akim Demaille  <[email protected]>

 	Version 1.29b.
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha
+AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha dist-bzip2

 ACLOCAL_AMFLAGS = -I m4

@@ -96,7 +96,7 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@

-AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha
+AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha dist-bzip2

 ACLOCAL_AMFLAGS = -I m4

@@ -153,7 +153,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)

-$(ACLOCAL_M4):  configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/dmalloc.m4 m4/error.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/m4.m4 m4/malloc.m4 m4/mbstate_t.m4 m4/prereq.m4 m4/progtest.m4 m4/realloc.m4 m4/strerror_r.m4 m4/warning.m4
+$(ACLOCAL_M4):  configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/dmalloc.m4 m4/error.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/m4.m4 m4/malloc.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/prereq.m4 m4/progtest.m4 m4/realloc.m4 m4/strerror_r.m4 m4/warning.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h
 	@if test ! -f $@; then \
@@ -292,7 +292,7 @@ distdir: $(DISTFILES)
 	fi
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/intl $(distdir)/po
+	$(mkinstalldirs) $(distdir)/intl $(distdir)/po $(distdir)/tests
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -330,6 +330,10 @@ dist: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)

+dist-bzip2: distdir
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
+
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
@@ -398,6 +402,7 @@ clean-am: clean-generic mostlyclean-am

 dist-all: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 distclean: distclean-recursive
 	-rm -f config.status config.cache config.log
@@ -434,19 +439,20 @@ uninstall-am: uninstall-info-am
 uninstall-info: uninstall-info-recursive

 .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-recursive dist dist-all distcheck distclean \
-	distclean-generic distclean-hdr distclean-recursive \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+	clean-generic clean-recursive dist dist-all dist-bzip2 \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
+	install-exec install-exec-am install-exec-recursive \
+	install-info install-info-am install-info-recursive install-man \
+	install-recursive install-strip installcheck installcheck-am \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive tags tags-recursive uninstall \
+	uninstall-am uninstall-info-am uninstall-info-recursive \
+	uninstall-recursive

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
@@ -1,7 +1,7 @@
 Bison News
 ----------

-Changes in version 1.29b:
+Changes in version 1.29c:

 * `--defines' and `--graph' have now an optionnal argument which is the
  output file name. `-d' and `-g' do not change, they do not take any
@@ -1,25 +1,27 @@
 Bison was originally written by Robert Corbett.  It would not be what
 it is today without the invaluable help of these people:

-Akim Demaille		[email protected]
+Akim Demaille           [email protected]
 Albert Chin-A-Young     [email protected]
-Daniel Hagerty  	[email protected]
-David J. MacKenzie  	djm@gnu.org
-Fabrice Bauzac		[email protected]
-Hans Aberg		[email protected]
-Jesse Thilo  		[email protected]
-Jim Meyering  		meyering@gnu.org
-Juan Manuel Guerrero	[email protected]
-Keith Browne		[email protected]
-Laurent Mascherpa	[email protected]
+Alexander Belopolsky    [email protected]
+Daniel Hagerty          hag@gnu.org
+David J. MacKenzie      [email protected]
+Fabrice Bauzac          [email protected]
+Hans Aberg              [email protected]
+Jesse Thilo             jthilo@gnu.org
+Jim Meyering            [email protected]
+Juan Manuel Guerrero    [email protected]
+Keith Browne            [email protected]
+Laurent Mascherpa       [email protected]
 Marc Autret             [email protected]
-Neil Booth		[email protected]
-Noah Friedman  		[email protected]
+Neil Booth              [email protected]
+Noah Friedman           [email protected]
 Pascal Bart             [email protected]
-Paul Eggert  		[email protected]
-Piotr Gackiewicz	[email protected]
-Richard Stallman  	[email protected]
+Paul Eggert             [email protected]
+Piotr Gackiewicz        [email protected]
+Richard Stallman        [email protected]
 Robert Anisko           [email protected]
+Shura                   [email protected]

 Many people are not named here because we lost track of them.  We
 thank them!  Please, help us keeping this list up to date.
@@ -788,21 +788,41 @@ AC_DEFUN(jm_FUNC_REALLOC,
  fi
 ])

-#serial 1
+#serial 2

 dnl These are the prerequisite macros for files in the lib/
 dnl directories of Bison.

 AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
-  AC_CHECK_FUNCS(isascii iswprint mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
+  AC_CHECK_FUNCS(isascii iswprint mbsinit)
+  jm_FUNC_MBRTOWC
+  AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
  AC_HEADER_STDC
  AC_C_BACKSLASH_A
  AC_MBSTATE_T
  AM_C_PROTOTYPES
 ])

+#serial 4
+
+dnl From Paul Eggert
+
+AC_DEFUN([jm_FUNC_MBRTOWC],
+[
+  AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
+    jm_cv_func_mbrtowc,
+    [AC_TRY_LINK(
+       [#include <wchar.h>],
+       [mbstate_t state; return ! (sizeof state && mbrtowc);],
+       jm_cv_func_mbrtowc=yes,
+       jm_cv_func_mbrtowc=no)])
+  if test $jm_cv_func_mbrtowc = yes; then
+    AC_DEFINE(HAVE_MBRTOWC, 1,
+      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
+  fi
+])
+
 #serial 3

 dnl From Paul Eggert.
@@ -113,9 +113,12 @@
 /* Define if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H

-/* Define if you have the `mbrtowc' function. */
+/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
 #undef HAVE_MBRTOWC

+/* Define if you have the `mbsinit' function. */
+#undef HAVE_MBSINIT
+
 /* Define if you have the `memchr' function. */
 #undef HAVE_MEMCHR

@@ -1 +1 @@
-1.29a
+1.29b
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.52e for GNU Bison 1.29b.
+# Generated by GNU Autoconf 2.52e for GNU Bison 1.29c.
 #
 # Report bugs to <[email protected]>.
 #
@@ -32,15 +32,33 @@ as_me=`echo "$0" |sed 's,\(.*[\\/]\+\)\?\([^\\/]\+\)[\\/]*,\2,'`
 # configure.  Hence a useless rewrite (not to mention the risk of
 # ``infinite'' rewrites.  Merely check that LINENO is incremented
 # between two lines, which is a property guaranteed for _oline_, hence
-# it protects us from repetitive rewrites.
+# it protects us from repetitive rewrites.  Be sure to have a test
+# that does detect non LINENO support...
 as_lineno_1=$LINENO
 as_lineno_2=$LINENO
-# Compute as_lineno_1 in two steps: some shells restart LINENO for
-# subshells.
-as_lineno_1=`(expr $as_lineno_1 + 1) 2>/dev/null`
-if test "x$as_lineno_1" != "x$as_lineno_2"; then
+as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+if test "x$as_lineno_1"  = "x$as_lineno_2" ||
+   test "x$as_lineno_3" != "x$as_lineno_2";
+  then
+  # Find who we are.
+  case $0 in
+    *[\\/]* | ?:[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  if test ! -f $as_myself; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
  if test ! -f $as_me.lineno ||
-     test x`ls -1dt $as_me.lineno $as_me 2>/dev/null | sed 1q` \
+     test x`ls -1dt $as_me.lineno $as_myself 2>/dev/null | sed 1q` \
                != x$as_me.lineno; then
     # Be sure to write the pattern so that it doesn't replace itself:
     # it must not match itself.
@@ -49,10 +67,15 @@ if test "x$as_lineno_1" != "x$as_lineno_2"; then
              while (sub (/[$]LINENO/, NR))
                continue
            print
-          }' <$as_me >$as_me.lineno
+          }' <$as_myself >$as_me.lineno
    chmod +x $as_me.lineno
  fi
-  exec ${SHELL-/bin/sh} ./$as_me.lineno
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  source ./$as_me.lineno
+  exit 0
 fi

 # Avoid depending upon Character Ranges.
@@ -240,8 +263,8 @@ mandir='${prefix}/man'
 # Identity of this package.
 PACKAGE_NAME='GNU Bison'
 PACKAGE_TARNAME='bison'
-PACKAGE_VERSION='1.29b'
-PACKAGE_STRING='GNU Bison 1.29b'
+PACKAGE_VERSION='1.29c'
+PACKAGE_STRING='GNU Bison 1.29c'
 PACKAGE_BUGREPORT='[email protected]'

 ac_prev=
@@ -658,7 +681,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures GNU Bison 1.29b to adapt to many kinds of systems.
+\`configure' configures GNU Bison 1.29c to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -724,7 +747,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Bison 1.29b:";;
+     short | recursive ) echo "Configuration of GNU Bison 1.29c:";;
   esac
  cat <<\_ACEOF

@@ -764,8 +787,10 @@ if test "$ac_init_help" = "recursive"; then
  # If there are subdirs, report their specific --help.
  ac_popdir=`pwd`
  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    cd $ac_dir
-    if test "$ac_dir" != .; then
+    test -d $ac_dir || continue
+    ac_builddir=.
+
+if test "$ac_dir" != .; then
  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
  # A "../" for each directory in $ac_dir_suffix.
  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
@@ -788,7 +813,14 @@ case $srcdir in
    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_buildpath=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_top_buildpath=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+ac_srcpath=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_top_srcpath=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`

+    cd $ac_dir
    # Check for guested configure; otherwise get Cygnus style configure.
    if test -f $ac_srcdir/configure.gnu; then
      echo
@@ -810,7 +842,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
  cat <<\_ACEOF
-GNU Bison configure 1.29b
+GNU Bison configure 1.29c
 generated by GNU Autoconf 2.52e

 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -825,7 +857,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by GNU Bison $as_me 1.29b, which was
+It was created by GNU Bison $as_me 1.29c, which was
 generated by GNU Autoconf 2.52e.  Invocation command line was

  $ $0 $@
@@ -1326,7 +1358,7 @@ fi

 # Define the identity of the package.
 PACKAGE=bison
-VERSION=1.29b
+VERSION=1.29c

 cat >>confdefs.h <<_ACEOF
 #define PACKAGE "$PACKAGE"
@@ -1380,6 +1412,8 @@ if test -f $srcdir/tests/atlocal.in; then

 fi

+ac_config_files="$ac_config_files tests/bison"
+
 # Checks for programs.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2563,6 +2597,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 ac_cv_header_stdc=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -3753,6 +3788,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 ac_cv_header_stdc=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -4274,6 +4310,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 ac_cv_header_stdc=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -4695,6 +4732,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 ac_cv_c_stack_direction=-1
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -5142,6 +5180,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 jm_cv_func_working_malloc=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -5200,6 +5239,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 jm_cv_func_working_realloc=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -5218,7 +5258,7 @@ _ACEOF

  fi

-for ac_func in isascii iswprint mbrtowc
+for ac_func in isascii iswprint mbsinit
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5293,7 +5333,60 @@ _ACEOF
 fi
 done

-for ac_header in limits.h stdlib.h string.h wchar.h wctype.h
+  echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
+echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6
+if test "${jm_cv_func_mbrtowc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <wchar.h>
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+mbstate_t state; return ! (sizeof state && mbrtowc);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  jm_cv_func_mbrtowc=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+jm_cv_func_mbrtowc=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $jm_cv_func_mbrtowc" >&5
+echo "${ECHO_T}$jm_cv_func_mbrtowc" >&6
+  if test $jm_cv_func_mbrtowc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MBRTOWC 1
+_ACEOF
+
+  fi
+
+for ac_header in limits.h stddef.h stdlib.h string.h wchar.h wctype.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -5528,6 +5621,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 ac_cv_header_stdc=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -5913,6 +6007,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 ac_cv_header_stdc=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -6239,6 +6334,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 ac_cv_header_stdc=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -6603,6 +6699,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 ac_cv_func_strerror_r_works=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -7154,6 +7251,7 @@ else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+( exit $ac_status )
 ac_cv_func_mmap_fixed_mapped=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -8530,15 +8628,34 @@ as_me=`echo "$0" |sed 's,\(.*[\\/]\+\)\?\([^\\/]\+\)[\\/]*,\2,'`
 # configure.  Hence a useless rewrite (not to mention the risk of
 # ``infinite'' rewrites.  Merely check that LINENO is incremented
 # between two lines, which is a property guaranteed for _oline_, hence
-# it protects us from repetitive rewrites.
+# it protects us from repetitive rewrites.  Be sure to have a test
+# that does detect non LINENO support...
 as_lineno_1=$LINENO
 as_lineno_2=$LINENO
-# Compute as_lineno_1 in two steps: some shells restart LINENO for
-# subshells.
-as_lineno_1=`(expr $as_lineno_1 + 1) 2>/dev/null`
-if test "x$as_lineno_1" != "x$as_lineno_2"; then
+as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+if test "x$as_lineno_1"  = "x$as_lineno_2" ||
+   test "x$as_lineno_3" != "x$as_lineno_2";
+  then
+  # Find who we are.
+  case $0 in
+    *[\\/]* | ?:[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  if test ! -f $as_myself; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
  if test ! -f $as_me.lineno ||
-     test x`ls -1dt $as_me.lineno $as_me 2>/dev/null | sed 1q` \
+     test x`ls -1dt $as_me.lineno $as_myself 2>/dev/null | sed 1q` \
                != x$as_me.lineno; then
     # Be sure to write the pattern so that it doesn't replace itself:
     # it must not match itself.
@@ -8547,10 +8664,15 @@ if test "x$as_lineno_1" != "x$as_lineno_2"; then
              while (sub (/[$]LINENO/, NR))
                continue
            print
-          }' <$as_me >$as_me.lineno
+          }' <$as_myself >$as_me.lineno
    chmod +x $as_me.lineno
  fi
-  exec ${SHELL-/bin/sh} ./$as_me.lineno
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  source ./$as_me.lineno
+  exit 0
 fi

 # Avoid depending upon Character Ranges.
@@ -8647,12 +8769,12 @@ exec 5>>config.log
 {
  echo
  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running \$as_me. ##
+## Running $as_me. ##
 _ASBOX
 } >&5
 cat >&5 <<_CSEOF

-This file was extended by GNU Bison $as_me 1.29b, which was
+This file was extended by GNU Bison $as_me 1.29c, which was
 generated by GNU Autoconf 2.52e.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -8714,7 +8836,7 @@ _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Bison config.status 1.29b
+GNU Bison config.status 1.29c
 configured by $0, generated by GNU Autoconf 2.52e,
  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

@@ -8814,6 +8936,7 @@ do
  case "$ac_config_target" in
  # Handling of arguments.
  "tests/atlocal" ) CONFIG_FILES="$CONFIG_FILES tests/atlocal" ;;
+  "tests/bison" ) CONFIG_FILES="$CONFIG_FILES tests/bison" ;;
  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
  "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
  "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
@@ -9066,7 +9189,9 @@ echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
  esac
 done; }

-  if test "$ac_dir" != .; then
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
  # A "../" for each directory in $ac_dir_suffix.
  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
@@ -9089,6 +9214,12 @@ case $srcdir in
    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_buildpath=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_top_buildpath=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+ac_srcpath=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_top_srcpath=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`

  case $INSTALL in
  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
@@ -9143,7 +9274,13 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s,@configure_input@,$configure_input,;t t
 s,@srcdir@,$ac_srcdir,;t t
+s,@srcpath@,$ac_srcpath,;t t
 s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@top_srcpath@,$ac_top_srcpath,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@buildpath@,$ac_buildpath,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@top_buildpath@,$ac_top_buildpath,;t t
 s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
  rm -f $tmp/stdin
@@ -9154,6 +9291,10 @@ s,@INSTALL@,$ac_INSTALL,;t t
    rm -f $tmp/out
  fi

+  # Run the commands associated with the file.
+  case $ac_file in
+    tests/bison ) chmod +x tests/bison ;;
+  esac
 done
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -9242,7 +9383,7 @@ s/[\\&,]/\\&/g
 s,[\\$`],\\&,g
 t clear
 : clear
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\(\([^ 	(][^ 	(]*\)([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
 t end
 s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
 : end
@@ -9397,7 +9538,9 @@ echo X"$ac_dest" |
  	  /^X\(\/\/\)$/{ s//\1/; q; }
  	  /^X\(\/\).*/{ s//\1/; q; }
  	  s/.*/./; q'`
-  if test "$ac_dir" != .; then
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
  # A "../" for each directory in $ac_dir_suffix.
  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
@@ -9420,6 +9563,12 @@ case $srcdir in
    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_buildpath=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_top_buildpath=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+ac_srcpath=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_top_srcpath=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`

  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
 echo "$as_me: executing $ac_dest commands" >&6;}
@@ -9439,9 +9588,13 @@ ATEOF
 # Copyright 2000, 2001 Free Software Foundation, Inc.

 at_testdir='tests'
+buildpath='$ac_buildpath'
 srcdir='$ac_srcdir'
+srcpath='$ac_srcpath'
 top_srcdir='$ac_top_srcdir'
+top_srcpath='$ac_top_srcpath'
 top_builddir='$ac_top_builddir'
+top_buildpath='$ac_top_buildpath'

 AUTOTEST_PATH='tests'

@@ -18,14 +18,15 @@
 # We need a recent Autoconf to run a recent Autotest.
 AC_PREREQ(2.52e)

-AC_INIT([GNU Bison], [1.29b], [[email protected]])
+AC_INIT([GNU Bison], [1.29c], [[email protected]])
 AC_CONFIG_AUX_DIR(config)

-AM_INIT_AUTOMAKE([bison], [1.29b])
+AM_INIT_AUTOMAKE([bison], [1.29c])
 AM_CONFIG_HEADER(config.h:config.hin)

 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])

 # Checks for programs.
 AC_PROG_CC
@@ -34,7 +34,7 @@ File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Bison
 *****

-   This manual documents version 1.29b of Bison, updated 20 September
+   This manual documents version 1.29c of Bison, updated 20 September
 2001.

 * Menu:
@@ -238,7 +238,7 @@ Bison in detail.
 it Yacc-compatible.  Wilfred Hansen of Carnegie Mellon University added
 multi-character string literals and other features.

-   This edition corresponds to version 1.29b of Bison.
+   This edition corresponds to version 1.29c of Bison.


 File: bison.info,  Node: Conditions,  Next: Copying,  Prev: Introduction,  Up: Top
@@ -1,4 +1,4 @@
@set UPDATED 20 September 2001
@set UPDATED-MONTH September 2001
-@set EDITION 1.29b
-@set VERSION 1.29b
+@set EDITION 1.29c
+@set VERSION 1.29c
@@ -1,4 +1,4 @@
@set UPDATED 20 September 2001
@set UPDATED-MONTH September 2001
-@set EDITION 1.29b
-@set VERSION 1.29b
+@set EDITION 1.29c
+@set VERSION 1.29c
@@ -1,4 +1,4 @@
-2001-07-24  GNU  <[email protected]>
+2001-09-13  GNU  <[email protected]>

-	* Version 0.10.39 released.
+	* Version 0.10.40 released.

@@ -1,19 +1,20 @@
 # Makefile for directory with message catalog handling in GNU NLS Utilities.
 # Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.

 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -74,7 +75,7 @@ DISTFILES.common = Makefile.in \
 config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc
+DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c

 # Libtool's library version information for libintl.
@@ -184,7 +185,7 @@ install-data: all
 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
 	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-	  dists="$(DISTFILES.common)"; \
+	  dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \
 	  for file in $$dists; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -243,7 +244,7 @@ uninstall:
 	  : ; \
 	fi
 	if test "$(PACKAGE)" = "gettext"; then \
-	  for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \
+	  for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
 	else \
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.39
+GNU gettext library from gettext-0.10.40
@@ -1,19 +1,20 @@
 /* Implementation of the bindtextdomain(3) function
   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Implementation of the dcgettext(3) function.
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Implementation of the internal dcigettext function.
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
   This must come before <config.h> because <config.h> may include
@@ -1,19 +1,20 @@
 /* Implementation of the dcngettext(3) function.
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Implementation of the dgettext(3) function.
   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Implementation of the dngettext(3) function.
   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
   Contributed by Ulrich Drepper <[email protected]>, 1995.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -2,19 +2,20 @@
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
   Written by Ulrich Drepper <[email protected]>, 1995.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Implementation of gettext(3) function.
   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Description of GNU message catalog format: general file layout.
   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1
@@ -2,19 +2,20 @@
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
   Written by Ulrich Drepper <[email protected]>, 1995.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
@@ -1,19 +1,20 @@
 /* Description of GNU message catalog format: string hashing function.
   Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* @@ end of prolog @@ */

@@ -2,19 +2,20 @@
   Library.
   Copyright (C) 1995, 2000, 2001 Software Foundation, Inc.

-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
   Contributed by Ulrich Drepper <[email protected]>, 1995.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* Tell glibc's <string.h> to provide a prototype for stpcpy().
   This must come before <config.h> because <config.h> may include
@@ -1,19 +1,20 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
@@ -1,19 +1,20 @@
 /* Message catalogs for internationalization.
   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _LIBINTL_H
 #define _LIBINTL_H	1
@@ -2,19 +2,20 @@
   This file is part of the GNU C Library.
   Contributed by Ulrich Drepper <[email protected]>, 1996.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _LOADINFO_H
 #define _LOADINFO_H	1
@@ -1,19 +1,20 @@
 /* Load needed message catalogs.
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
   This must come before <config.h> because <config.h> may include
@@ -1,19 +1,20 @@
 # Locale name alias data base.
 # Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.

 # The format of this file is the same as for the corresponding file of
 # the X Window System, which normally can be found in
@@ -46,7 +47,7 @@ galego		gl_ES.ISO-8859-1
 galician	gl_ES.ISO-8859-1
 german		de_DE.ISO-8859-1
 greek           el_GR.ISO-8859-7
-hebrew          iw_IL.ISO-8859-8
+hebrew          he_IL.ISO-8859-8
 hrvatski	hr_HR.ISO-8859-2
 hungarian       hu_HU.ISO-8859-2
 icelandic       is_IS.ISO-8859-1
@@ -1,19 +1,20 @@
 /* Handle aliases for locale names.
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
   This must come before <config.h> because <config.h> may include
@@ -1,19 +1,20 @@
 /* Implementation of ngettext(3) function.
   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -23,19 +23,20 @@
   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
   Written by Ulrich Drepper <[email protected]>, 2000.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
   declaration at the beginning of the file.  The declaration in bison's
@@ -66,13 +67,13 @@
 #define YYLEX_PARAM	&((struct parse_args *) arg)->cp
 #define YYPARSE_PARAM	arg

-#line 52 "plural.y"
+#line 53 "plural.y"
 typedef union {
  unsigned long int num;
  enum operator op;
  struct expression *exp;
 } YYSTYPE;
-#line 58 "plural.y"
+#line 59 "plural.y"

 /* Prototypes for local functions.  */
 static struct expression *new_exp PARAMS ((int nargs, enum operator op,
@@ -234,8 +235,8 @@ static const short yyrhs[] = {    17,

 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   177,   185,   189,   193,   197,   201,   205,   209,   213,   217,
-   221,   226
+   178,   186,   190,   194,   198,   202,   206,   210,   214,   218,
+   222,   227
 };
 #endif

@@ -845,7 +846,7 @@ yyreduce:
  switch (yyn) {

 case 1:
-#line 178 "plural.y"
+#line 179 "plural.y"
 {
 	    if (yyvsp[0].exp == NULL)
 	      YYABORT;
@@ -853,68 +854,68 @@ case 1:
 	  ;
    break;}
 case 2:
-#line 186 "plural.y"
+#line 187 "plural.y"
 {
 	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 3:
-#line 190 "plural.y"
+#line 191 "plural.y"
 {
 	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 4:
-#line 194 "plural.y"
+#line 195 "plural.y"
 {
 	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 5:
-#line 198 "plural.y"
+#line 199 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 6:
-#line 202 "plural.y"
+#line 203 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 7:
-#line 206 "plural.y"
+#line 207 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 8:
-#line 210 "plural.y"
+#line 211 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 9:
-#line 214 "plural.y"
+#line 215 "plural.y"
 {
 	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
 	  ;
    break;}
 case 10:
-#line 218 "plural.y"
+#line 219 "plural.y"
 {
 	    yyval.exp = new_exp_0 (var);
 	  ;
    break;}
 case 11:
-#line 222 "plural.y"
+#line 223 "plural.y"
 {
 	    if ((yyval.exp = new_exp_0 (num)) != NULL)
 	      yyval.exp->val.num = yyvsp[0].num;
 	  ;
    break;}
 case 12:
-#line 227 "plural.y"
+#line 228 "plural.y"
 {
 	    yyval.exp = yyvsp[-1].exp;
 	  ;
@@ -1141,7 +1142,7 @@ yyerrhandle:
    }
  return 1;
 }
-#line 232 "plural.y"
+#line 233 "plural.y"


 void
@@ -3,19 +3,20 @@
   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
   Written by Ulrich Drepper <[email protected]>, 2000.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
   declaration at the beginning of the file.  The declaration in bison's
@@ -1,19 +1,20 @@
 /* Implementation of the textdomain(3) function.
   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -63,6 +63,11 @@
 #endif

 #if HAVE_WCHAR_H
+
+/* BSD/OS 4.1 wchar.h requires FILE and struct tm to be declared.  */
+# include <stdio.h>
+# include <time.h>
+
 # include <wchar.h>
 #endif

@@ -73,8 +78,12 @@
 # undef MB_CUR_MAX
 # define MB_CUR_MAX 1
 # define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0)
-# define mbsinit(ps) 1
 # define iswprint(wc) ISPRINT ((unsigned char) (wc))
+# undef HAVE_MBSINIT
+#endif
+
+#if !defined mbsinit && !HAVE_MBSINIT
+# define mbsinit(ps) 1
 #endif

 #ifndef iswprint
@@ -11,6 +11,7 @@ isc-posix.m4					\
 lcmessage.m4					\
 m4.m4						\
 malloc.m4					\
+mbrtowc.m4					\
 mbstate_t.m4					\
 prereq.m4					\
 progtest.m4					\
@@ -108,6 +108,7 @@ isc-posix.m4					\
 lcmessage.m4					\
 m4.m4						\
 malloc.m4					\
+mbrtowc.m4					\
 mbstate_t.m4					\
 prereq.m4					\
 progtest.m4					\
@@ -0,0 +1,18 @@
+#serial 4
+
+dnl From Paul Eggert
+
+AC_DEFUN([jm_FUNC_MBRTOWC],
+[
+  AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
+    jm_cv_func_mbrtowc,
+    [AC_TRY_LINK(
+       [#include <wchar.h>],
+       [mbstate_t state; return ! (sizeof state && mbrtowc);],
+       jm_cv_func_mbrtowc=yes,
+       jm_cv_func_mbrtowc=no)])
+  if test $jm_cv_func_mbrtowc = yes; then
+    AC_DEFINE(HAVE_MBRTOWC, 1,
+      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
+  fi
+])
@@ -1,12 +1,13 @@
-#serial 1
+#serial 2

 dnl These are the prerequisite macros for files in the lib/
 dnl directories of Bison.

 AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
-  AC_CHECK_FUNCS(isascii iswprint mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
+  AC_CHECK_FUNCS(isascii iswprint mbsinit)
+  jm_FUNC_MBRTOWC
+  AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
  AC_HEADER_STDC
  AC_C_BACKSLASH_A
  AC_MBSTATE_T
@@ -1,3 +1,8 @@
+2001-09-27  gettextize  <[email protected]>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+	* cat-id-tbl.c: Remove file.
+
 2001-08-03  gettextize  <[email protected]>

 	* Makefile.in.in: Upgrade to gettext-0.10.39.
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
 "Last-Translator: Ulrich Drepper <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -129,12 +129,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s leitet ab"

-#: src/files.c:136
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:155
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""

@@ -208,7 +208,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""

-#: src/getargs.c:214 src/lex.c:639
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -278,7 +278,7 @@ msgstr "unerwarteter Typname"
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"

-#: src/main.c:124
+#: src/main.c:125
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"
@@ -794,11 +794,11 @@ msgstr "%s: Hauptspeicher ersch
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""

@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -192,12 +192,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s deriva"

-#: src/files.c:136
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:155
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""

@@ -271,7 +271,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""

-#: src/getargs.c:214 src/lex.c:639
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -346,7 +346,7 @@ msgstr "nombre de tipo sin terminar"
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "use \"...\" para terminales literales multicarácter"

-#: src/main.c:124
+#: src/main.c:125
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"
@@ -924,11 +924,11 @@ msgstr "%s: memoria agotada\n"
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28d\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 2001-08-29 17:06+02:00\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -128,12 +128,12 @@ msgstr "DERIVES"
 msgid "%s derives"
 msgstr "%s derives"

-#: src/files.c:136
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"

-#: src/files.c:155
+#: src/files.c:152
 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"

@@ -231,7 +231,7 @@ msgstr ""
 "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"

-#: src/getargs.c:214 src/lex.c:639
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ei ole enam toetatud"
@@ -299,7 +299,7 @@ msgstr "l
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"

-#: src/main.c:124
+#: src/main.c:125
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: sisemine viga: %s\n"
@@ -783,11 +783,11 @@ msgstr "m
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28d\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 2001-08-29 20:00-0500\n"
 "Last-Translator: Michel Robitaille <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -130,12 +130,12 @@ msgstr "D
 msgid "%s derives"
 msgstr "%s dérive"

-#: src/files.c:136
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne peut ouvrir le fichier `%s'"

-#: src/files.c:155
+#: src/files.c:152
 msgid "cannot close file"
 msgstr "ne peut fermer le fichier"

@@ -237,7 +237,7 @@ msgstr ""
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"

-#: src/getargs.c:214 src/lex.c:639
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' n'est plus supporté"
@@ -305,7 +305,7 @@ msgstr "le nom de type ne se termine pas"
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"

-#: src/main.c:124
+#: src/main.c:125
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: erreur interne: %s\n"
@@ -790,11 +790,11 @@ msgstr "m
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 1999-09-28 21:10+0900\n"
 "Last-Translator: Daisuke Yamashita <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -135,12 +135,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s は以下から派生"

-#: src/files.c:136
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:155
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""

@@ -214,7 +214,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""

-#: src/getargs.c:214 src/lex.c:639
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -283,7 +283,7 @@ msgstr "
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "複数文字のリテラルトークンには \"...\" を使いましょう"

-#: src/main.c:124
+#: src/main.c:125
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: 内部エラー: %s\n"
@@ -796,11 +796,11 @@ msgstr "%s:
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
 "Last-Translator: Erick Branderhorst <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -135,12 +135,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s afgeleiden"

-#: src/files.c:136
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:155
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""

@@ -214,7 +214,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""

-#: src/getargs.c:214 src/lex.c:639
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -283,7 +283,7 @@ msgstr "niet getermineerd type naam"
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "gebruik \"...\" voor meerdere karakters literal tekens"

-#: src/main.c:124
+#: src/main.c:125
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"
@@ -799,11 +799,11 @@ msgstr "%s: geen geheugen meer beschikbaar\n"
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 2001-09-09 13:49+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -129,12 +129,12 @@ msgstr "DERIVES"
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"

-#: src/files.c:136
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"

-#: src/files.c:155
+#: src/files.c:152
 msgid "cannot close file"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"

@@ -236,7 +236,7 @@ msgstr ""
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"

-#: src/getargs.c:214 src/lex.c:639
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
@@ -304,7 +304,7 @@ msgstr "
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"

-#: src/main.c:124
+#: src/main.c:125
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n"
@@ -787,11 +787,11 @@ msgstr "
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28c\n"
-"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 2001-09-10 10:54GMT\n"
 "Last-Translator: Altug Bayram <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -131,12 +131,12 @@ msgstr "T
 msgid "%s derives"
 msgstr "%s türetildi"

-#: src/files.c:136
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "`%s' dosyasý açýlamadý"

-#: src/files.c:155
+#: src/files.c:152
 msgid "cannot close file"
 msgstr "dosya kapatýlamýyor"

@@ -238,7 +238,7 @@ msgstr ""
 "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya HERHANGÝ BÝR AMACA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"

-#: src/getargs.c:214 src/lex.c:639
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' artýk desteklenmiyor"
@@ -306,7 +306,7 @@ msgstr "sonland
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"

-#: src/main.c:124
+#: src/main.c:125
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: iç hata: %s\n"
@@ -789,11 +789,11 @@ msgstr "bellek t
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"

@@ -94,8 +94,7 @@ stringappend (const char *string1, const char *string2)
 static char *
 compute_header_macro (void)
 {
-  int ite;
-  char *macro_name;
+  char *macro_name, *cp;

  if (spec_defines_file)
    macro_name = xstrdup (spec_defines_file);
@@ -109,14 +108,12 @@ compute_header_macro (void)
      strcat (macro_name, header_extension);
    }

-  for (ite = 0; macro_name[ite]; ite++)
-    if (macro_name[ite] == '.')
-      macro_name[ite] = '_';
-    else
-      {
-	if (islower (macro_name[ite]))
-	  macro_name[ite] -= ('a' - 'A');
-      }
+  for (cp = macro_name; *cp; ++cp)
+    if (islower (*cp))
+      *cp = toupper (*cp);
+    else if (!isalnum (*cp))
+      *cp = '_';
+
  return macro_name;
 }

@@ -200,17 +197,42 @@ skeleton_find (const char *envvar, const char *skeleton_name)
 {
  const char *res = getenv (envvar);

-#ifdef MSDOS
-  const char *cp;
-
-  /* File doesn't exist in current directory; try in INIT directory.  */
-  if (!res && (cp = getenv ("INIT")))
+#if defined (MSDOS) || defined (_WIN32)
+  if (!res)
    {
-      res = XMALLOC (char, strlen (cp) + strlen (skeleton_name) + 2);
-      sprintf (res, "%s%c%s", cp, '/', skeleton_name);
-    }
-#endif /* !MSDOS */
+      /* Skeleton file name without path */
+      const char *skel_name = strrchr(skeleton_name, '/');
+      if (!skel_name)
+        skel_name = strrchr(skeleton_name, '\\');
+      if (!skel_name)
+        skel_name = skeleton_name;
+      else
+        ++skel_name;

+      /* File doesn't exist in current directory; try in INIT directory.  */
+      const char *cp = getenv ("INIT");
+      if (cp)
+	{
+	  res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2);
+	  sprintf (res, "%s%c%s", cp, '\\', skel_name);
+	}
+      else if (access (skel_name, 4) == 0) /* Look in current dir. */
+        res = skel_name;
+      else
+	{
+	  /* Look in program locations dir. */
+	  extern char *program_name;
+	  cp = strrchr(program_name, '\\');
+	  if (!cp)
+	    return skeleton_name;
+	  else
+	    ++cp;
+	  res = XMALLOC (char, cp - program_name + strlen (skel_name) + 1);
+	  strncpy (res, program_name, cp - program_name);
+	  strcpy (res + (cp - program_name), skel_name);
+	}
+    }
+#endif /* defined (MSDOS) || defined (_WIN32) */
  if (!res)
    res = skeleton_name;

@@ -50,7 +50,7 @@ static struct option longopts[] =

  /* Parser. */
  {"skeleton",		required_argument,	0, 'S'},
-  {"debug",		no_argument,		0, 'd'},
+  {"debug",		no_argument,		0, 't'},
  {"locations",		no_argument, 	&locations_flag, 1},
  /* was 'a';  apparently unused -wjh */
  {"name-prefix",	required_argument, 	0, 'p'},
@@ -183,7 +183,7 @@ getargs (int argc, char *argv[])
 	exit (0);

      case 'g':
-	/* Here, the -g and --graph=FILE options are differentiated.  */	
+	/* Here, the -g and --graph=FILE options are differentiated.  */
 	graph_flag = 1;
 	spec_graph_file = optarg;
 	break;
@@ -321,7 +321,7 @@ literalchar (struct obstack *out, int *pcode, char term)


 void
-unlex (int token)
+unlex (token_t token)
 {
  unlexed = token;
  unlexed_symval = symval;
@@ -469,32 +469,40 @@ lex (void)
      }

    case ',':
+      token_buffer = ",";
      return tok_comma;

    case ':':
+      token_buffer = ":";
      return tok_colon;

    case ';':
+      token_buffer = ";";
      return tok_semicolon;

    case '|':
+      token_buffer = "|";
      return tok_bar;

    case '{':
+      token_buffer = "{";
      return tok_left_curly;

    case '=':
+      obstack_1grow (&token_obstack, c);
      do
 	{
 	  c = getc (finput);
+	  obstack_1grow (&token_obstack, c);
 	  if (c == '\n')
 	    lineno++;
 	}
      while (c == ' ' || c == '\n' || c == '\t');
+      obstack_1grow (&token_obstack, '\0');
+      token_buffer = obstack_finish (&token_obstack);

      if (c == '{')
 	{
-	  token_buffer = "={";
 	  return tok_left_curly;
 	}
      else
@@ -511,6 +519,9 @@ lex (void)
      return parse_percent_token ();

    default:
+      obstack_1grow (&token_obstack, c);
+      obstack_1grow (&token_obstack, '\0');
+      token_buffer = obstack_finish (&token_obstack);
      return tok_illegal;
    }
 }
@@ -61,7 +61,7 @@ extern int numval;
 void lex_init PARAMS ((void));
 void lex_free PARAMS ((void));
 int skip_white_space PARAMS ((void));
-void unlex PARAMS ((int));
+void unlex PARAMS ((token_t));
 void read_type_name PARAMS ((FILE *fin));

 /* Return one of the token-type codes.  When an identifier is seen,
@@ -35,6 +35,7 @@
 #include "conflicts.h"
 #include "print_graph.h"
 #include "symtab.h"
+#include "lex.h"

 /* The name this program was run with, for messages.  */
 char *program_name;
@@ -1160,6 +1160,7 @@ output_parser (void)
      else
 	skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
    }
+  assert (skeleton);
  fskel = xfopen (skeleton, "r");

  /* Set LINE to 2, not 1: `#line LINENUM' -- Here LINENUM is a
@@ -16,3 +16,4 @@ calc.tab.*
 calc
 *.output *.vcg
 autom4te.cache
+bison
@@ -18,9 +18,9 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.

-EXTRA_DIST = atlocal.in bison $(TESTSUITE_AT) testsuite
+EXTRA_DIST = atlocal.in $(TESTSUITE_AT) testsuite

-DISTCLEANFILES       = atconfig atlocal package.m4
+DISTCLEANFILES       = atconfig atlocal bison package.m4
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)

 TESTSUITE_AT = \
@@ -96,9 +96,9 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@

-EXTRA_DIST = atlocal.in bison $(TESTSUITE_AT) testsuite
+EXTRA_DIST = atlocal.in $(TESTSUITE_AT) testsuite

-DISTCLEANFILES = atconfig atlocal package.m4
+DISTCLEANFILES = atconfig atlocal bison package.m4
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)

 TESTSUITE_AT = \
@@ -112,9 +112,9 @@ AUTOTEST = $(AUTOM4TE) --language=autotest
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = bison
 DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = Makefile.am Makefile.in bison.in
 all: all-am

 .SUFFIXES:
@@ -125,6 +125,8 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+bison: $(top_builddir)/config.status bison.in
+	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 uninstall-info-am:
 tags: TAGS
 TAGS:
@@ -1,11 +1,11 @@
 #! /bin/sh
+# @configure_generated@
 # Wrapper around a non installed bison to make it work as an installed one.
-. ./atconfig

 # We want to use the files shipped with Bison.
-BISON_SIMPLE=$top_srcdir/src/bison.simple
+BISON_SIMPLE='@top_srcpath@/src/bison.simple'
 export BISON_SIMPLE
-BISON_HAIRY=$top_srcdir/src/bison.hairy
+BISON_HAIRY='@top_srcpath@/src/bison.hairy'
 export BISON_HAIRY

-exec $top_builddir/src/bison ${1+"$@"}
+exec '@top_buildpath@/src/bison' ${1+"$@"}
@@ -261,18 +261,25 @@ m4_define([AT_DATA_CALC_Y],



-# _AT_CHECK_CALC(BISON-OPTIONS, INPUT)
-# ------------------------------------
+# _AT_CHECK_CALC(BISON-OPTIONS, INPUT, [NUM-STDERR-LINES = 0])
+# ------------------------------------------------------------
 # Run `calc' on INPUT and expect no STDOUT nor STDERR.
+#
+# If BISON-OPTIONS contains `--debug', then NUM-STDERR-LINES is the number
+# of expected lines on stderr.
 m4_define([_AT_CHECK_CALC],
 [AT_DATA([[input]],
 [[$2
 ]])
-AT_CHECK([calc input])dnl
+AT_CHECK([calc input], 0, [], [stderr])dnl
+AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
+         [m4_match([$1], [--debug],
+                   [$3], [0])
+])
 ])


-# _AT_CHECK_CALC_ERROR(BISON-OPTIONS, INPUT,
+# _AT_CHECK_CALC_ERROR(BISON-OPTIONS, INPUT, [NUM-DEBUG-LINES],
 #                      [ERROR-LOCATION], [IF-YYERROR-VERBOSE])
 # ------------------------------------------------------------
 # Run `calc' on INPUT, and expect a `parse error' message.
@@ -283,18 +290,33 @@ AT_CHECK([calc input])dnl
 # If BISON-OPTIONS contains `--yyerror-verbose', then make sure the
 # IF-YYERROR-VERBOSE message is properly output after `parse error, '
 # on STDERR.
+#
+# If BISON-OPTIONS contains `--debug', then NUM-STDERR-LINES is the number
+# of expected lines on stderr.
 m4_define([_AT_CHECK_CALC_ERROR],
 [AT_DATA([[input]],
 [[$2
 ]])

-AT_CHECK([calc input], 0,
-         [],
-[m4_match([$1], [--location], [$3: ])[]dnl
-parse error[]dnl
-m4_match([$1], [--yyerror-verbose], [, $4])[]dnl
+AT_CHECK([calc input], 0, [], [stderr])

-])])
+
+AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
+         [m4_match([$1], [--debug],
+                   [$3], [1])
+])
+
+egrep -v '^((Start|Enter|Read|Reduc|Shift)ing|state|Error:) ' stderr >at-stderr
+mv at-stderr stderr
+
+AT_CHECK([cat stderr], 0,
+[m4_match([$1], [--location], [$4: ])[]dnl
+parse error[]dnl
+m4_match([$1], [--yyerror-verbose], [, $5])[]dnl
+
+])
+
+])


 # AT_CHECK_CALC([BISON-OPTIONS], [PARSER-EXPECTED-STDERR])
@@ -326,24 +348,25 @@ _AT_CHECK_CALC([$1],
 1 - (2 - 3) = 2

 2^2^3 = 256
-(2^2)^3 = 64], [$2])
+(2^2)^3 = 64], [491])

 # Some parse errors.
-_AT_CHECK_CALC_ERROR([$1], [+1],
+_AT_CHECK_CALC_ERROR([$1], [+1], [8],
                     [1.0:1.1],
                     [unexpected `'+''])
-_AT_CHECK_CALC_ERROR([$1], [1//2],
+_AT_CHECK_CALC_ERROR([$1], [1//2], [17],
                     [1.2:1.3],
                     [unexpected `'/'', expecting `NUM' or `'-'' or `'(''])
-_AT_CHECK_CALC_ERROR([$1], [error],
+_AT_CHECK_CALC_ERROR([$1], [error], [8],
                     [1.0:1.1],
                     [unexpected `$undefined.'])
-_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3],
+_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [23],
                     [1.6:1.7],
                     [unexpected `'=''])
 _AT_CHECK_CALC_ERROR([$1],
                     [
 +1],
+                     [16],
                     [2.0:2.1],
                     [unexpected `'+''])

@@ -74,7 +74,7 @@ AT_CLEANUP([union.*])
 AT_SETUP([%union and C comments])

 AT_DATA([union-comment.y],
-[%union	
+[%union
 {
  /* The int.  */	int   integer;
  /* The string.  */	char *string ;
@@ -87,3 +87,45 @@ AT_CHECK([bison union-comment.y])
 AT_CHECK([fgrep '//*' union-comment.tab.c], [1], [])

 AT_CLEANUP([union-comment.*])
+
+
+## --------------- ##
+## invalid input.  ##
+## --------------- ##
+
+
+AT_SETUP([Invalid input])
+
+AT_DATA([input.y],
+[[%%
+?
+]])
+
+AT_CHECK([bison input.y], [1], [],
+[input.y:2: invalid input: `?'
+input.y:3: fatal error: no rules in the input grammar
+])
+
+AT_CLEANUP
+
+
+## --------------------- ##
+## Invalid CPP headers.  ##
+## --------------------- ##
+
+AT_SETUP([Invalid CPP headers])
+
+mkdir input
+
+AT_DATA([input/input.y],
+[%%
+dummy:
+])
+
+AT_CHECK([bison --defines input/input.y])
+
+AT_CHECK([sed 1q input/input.tab.h], 0,
+[[#ifndef INPUT_INPUT_TAB_H
+]])
+
+AT_CLEANUP(input)
@@ -19,11 +19,11 @@
 # 02111-1307, USA.

 # We need a recent Autotest.
-m4_version_prereq([2.52d])
+m4_version_prereq([2.52e])

 AT_INIT

-AT_VICTIMS([bison])
+AT_TESTED([bison])

 m4_include([output.at])
 m4_include([calc.at])
Author	SHA1	Message	Date
Akim Demaille	72ab1d45d2	Version 1.29c.	2001-10-02 16:23:59 +00:00
Akim Demaille	d9302e4b73	* tests/regression.at (Invalid CPP headers): New. From Alexander Belopolsky. * src/files.c (compute_header_macro): Map non alnum chars to `_'.	2001-10-02 16:17:41 +00:00
Akim Demaille	f1394282f0	* tests/regression.at (Invalid input): New. * src/lex.c (lex): Be sure to set `token_buffer' in any case. Reported by Shura.	2001-10-02 15:52:24 +00:00
Akim Demaille	d8b1af2801	* tests/calc.at: Now that --debug works, the tests must be adjusted.	2001-10-02 15:36:11 +00:00
Akim Demaille	445cb4e989	* src/output.c (output_parser): Assert `skeleton'. * src/files.c (skeleton_find): Look harder for skeletons on DOSish systems. From Shura.	2001-10-02 14:48:53 +00:00
Marc Autret	f40703a29a	Adjust	2001-10-01 19:59:56 +00:00
Marc Autret	e348b12ae0	* src/lex.h: Echo modifications. * src/lex.c (unlex): Parameter is now token_t.	2001-10-01 19:47:09 +00:00
Marc Autret	ba6f6bf90f	* src/main.c: Include lex.h.	2001-10-01 19:37:31 +00:00
Akim Demaille	d9af6cc62f	* src/getargs.c (longopts): `--debug' is` -t', not `-d'.	2001-09-29 15:32:36 +00:00
Akim Demaille	ab30845981	* tests/testsuite.at: Update to newer Autotest. * tests/Makefile.am (EXTRA_DIST): bison is not to be shipped.	2001-09-28 11:56:12 +00:00
Akim Demaille	0b3870c112	Make bzip2 dists.	2001-09-27 15:24:45 +00:00
Akim Demaille	e92a5d5bae	Add.	2001-09-27 15:07:44 +00:00
Akim Demaille	02cbcfc577	Position independent wrapper. * tests/bison: Remove. * tests/bison.in: New. * configure.in: Adjust.	2001-09-27 15:06:14 +00:00
Akim Demaille	8c67836b58	Position independent wrapper. * tests/bison: Remove. * tests/bison.in: New. * configure.in: Adjust.	2001-09-27 15:00:02 +00:00
Akim Demaille	cae30a7df4	Port quotearg fixes from tar 1.13.24. * lib/quotearg.c: BSD/OS 4.1 wchar.h requires FILE and struct tm to be declared. (HAVE_MBSINIT): Undef if !HAVE_MBRTOWC. (mbsinit): Define to 1 if !defined mbsinit && !HAVE_MBSINIT. * m4/Makefile.am (EXTRA_DIST): Add mbrtowc.m4. * m4/mbrtowc.m4: New file. * m4/prereq.m4 (jm_PREREQ_QUOTEARG): Check for mbsinit and stddef.h. Use jm_FUNC_MBRTOWC instead of AC_CHECK_FUNCS(mbrtowc).	2001-09-27 14:25:57 +00:00
Akim Demaille	9fb2ad6738	Gettext 0.10.40.	2001-09-27 14:06:39 +00:00
Akim Demaille	8bce355d7c	Bump to 1.29c.	2001-09-27 09:19:45 +00:00
Akim Demaille	ae7c7ada67	.	2001-09-27 09:02:40 +00:00
@@ -1 +1 @@
 .29a
 .29b