Update and Regen.

Regen.
Version 1.30.
2026-08-15 05:35:14 +00:00 · 2001-10-29 08:51:57 +00:00 · 2001-10-26 14:33:02 +00:00 · 2001-10-26 13:43:20 +00:00 · 2001-10-26 13:29:29 +00:00 · 2001-10-26 13:10:17 +00:00
66 changed files with 2191 additions and 1709 deletions
@@ -1,3 +1,61 @@
 2001-10-26  Akim Demaille  <[email protected]>
 	Version 1.30.
 2001-10-26  Paul Eggert  <[email protected]>
 	* lib/error.c, lib/error.h, lib/getopt.c, lib/getopt.h,
 	  lib/getopt1.c, lib/obstack.c, lib/obstack.h, lib/quote.c,
 	  lib/strnlen.c, lib/xmalloc.c, m4/c-bs-a.m4, m4/error.m4,
 	  m4/gettext.m4, m4/lcmessage.m4, m4/malloc.m4, m4/mbstate_t.m4,
 	  m4/progtest.m4, m4/realloc.m4, m4/strerror_r.m4:
 	Sync with fileutils 4.1.1.
 2001-10-18  Akim Demaille  <[email protected]>
 	Version 1.29f.
 	* tests/calc.at (_AT_CHECK_CALC_ERROR): Don't use `foo && bar', to
 	avoid spurious failures.
 2001-10-18  Akim Demaille  <[email protected]>
 	Version 1.29e.
 2001-10-18  Akim Demaille  <[email protected]>
 	* tests/atlocal.in (GCC): Add.
 	* tests/calc.at: s/m4_match/m4_bmatch/.
 	s/m4_patsubst/m4_bpatsubst/.
 	(AT_CHECK_CALC): Check the compiler's stderr only if it's GCC.
 	* configure.in: AC_SUBST(GCC).
 2001-10-10  Akim Demaille  <[email protected]>
 	* m4/m4.m4: Remove.
 	* configure.in: M4 is no longer needed, but autom4te is.
 	* tests/Makefile.am (AUTOTEST): Don't define AUTOM4TE, let
 	AC_SUBST do it.
 2001-10-10  Akim Demaille  <[email protected]>
 	Bump to 1.29e.
 2001-10-10  Akim Demaille  <[email protected]>
 	Version 1.29d.
 	* src/bison.simple: Be sure to set YYSTACK_USE_ALLOCA.
 	Use `#if !YYSTACK_USE_ALLOCA', not `#ifndef'.
 	Reported by Airy Andre.
 2001-10-10  Akim Demaille  <[email protected]>
 	* INSTALL, config/config.guess, config/config.sub, config/mdate-sh
 	* config/mkinstalldirs, lib/ansi2knr.c: Update.
 2001-10-02  Akim Demaille  <[email protected]>
 	Bump 1.29d.
 2001-10-02  Akim Demaille  <[email protected]>
 	Version 1.29c.
@@ -1,3 +1,9 @@
 Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation,
 Inc.
   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
@@ -8,20 +14,27 @@ various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
+you can run in the future to recreate the current configuration, and a
-`config.cache' that saves the results of its tests to speed up
+file `config.log' containing compiler output (useful mainly for
-reconfiguring, and a file `config.log' containing compiler output
+debugging `configure').
-(useful mainly for debugging `configure').
+
   It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
 the results of its tests to speed up reconfiguring.  (Caching is
 disabled by default to prevent problems with accidental use of stale
 cache files.)
   If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
+be considered for the next release.  If you are using the cache, and at
-contains results you don't want to keep, you may remove or edit it.
+some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
-   The file `configure.in' is used to create `configure' by a program
+   The file `configure.ac' (or `configure.in') is used to create
-called `autoconf'.  You only need `configure.in' if you want to change
+`configure' by a program called `autoconf'.  You only need
-it or regenerate `configure' using a newer version of `autoconf'.
+`configure.ac' if you want to change it or regenerate `configure' using
 a newer version of `autoconf'.
 The simplest way to compile this package is:
@@ -55,14 +68,15 @@ Compilers and Options
 =====================
   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
+the `configure' script does not know about.  Run `./configure --help'
-initial values for variables by setting them in the environment.  Using
+for details on some of the pertinent environment variables.
 a Bourne-compatible shell, you can do that on the command line like
 this:
     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-Or on systems that have the `env' program, you can do it like this:
+   You can give `configure' initial values for variables by setting
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+them in the environment.  You can do that on the command line like this:
     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
   *Note Defining Variables::, for more details.
 Compiling For Multiple Architectures
 ====================================
@@ -75,11 +89,11 @@ directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
-   If you have to use a `make' that does not supports the `VPATH'
+   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a time
+variable, you have to compile the package for one architecture at a
-in the source code directory.  After you have installed the package for
+time in the source code directory.  After you have installed the
-one architecture, use `make distclean' before reconfiguring for another
+package for one architecture, use `make distclean' before reconfiguring
-architecture.
+for another architecture.
 Installation Names
 ==================
@@ -122,22 +136,35 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
-   There may be some features `configure' can not figure out
+   There may be some features `configure' cannot figure out
 automatically, but needs to determine by the type of host the package
 will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
+a message saying it cannot guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
+`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+type, such as `sun4', or a canonical name which has the form:
     CPU-COMPANY-SYSTEM
-See the file `config.sub' for the possible values of each field.  If
+where SYSTEM can have one of these forms:
     OS KERNEL-OS
   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
 need to know the host type.
-   If you are building compiler tools for cross-compiling, you can also
+   If you are _building_ compiler tools for cross-compiling, you should
 use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
+produce code for.
-system on which you are compiling the package.
+
   If you want to _use_ a cross compiler, that generates code for a
 platform different from the build platform, you should specify the host
 platform (i.e., that on which the generated programs will eventually be
 run) with `--host=TYPE'.  In this case, you should also specify the
 build platform with `--build=TYPE', because, in this case, it may not
 be possible to guess the build platform (it sometimes involves
 compiling and running simple test programs, and this can't be done if
 the compiler is a cross compiler).
 Sharing Defaults
 ================
@@ -150,20 +177,44 @@ default values for variables like `CC', `cache_file', and `prefix'.
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
-Operation Controls
+Defining Variables
 ==================
   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
 them in the `configure' command line, using `VAR=value'.  For example:
     ./configure CC=/usr/local2/bin/gcc
 will cause the specified gcc to be used as the C compiler (unless it is
 overridden in the site shell script).
 `configure' Invocation
 ======================
   `configure' recognizes the following options to control how it
 operates.
 `--cache-file=FILE'
     Use and save the results of the tests in FILE instead of
     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
     debugging `configure'.
 `--help'
 `-h'
     Print a summary of the options to `configure', and exit.
 `--version'
 `-V'
     Print the version of Autoconf used to generate the `configure'
     script, and exit.
 `--cache-file=FILE'
     Enable the cache: use and save the results of the tests in FILE,
     traditionally `config.cache'.  FILE defaults to `/dev/null' to
     disable caching.
 `--config-cache'
 `-C'
     Alias for `--cache-file=config.cache'.
 `--quiet'
 `--silent'
 `-q'
@@ -175,8 +226,6 @@ operates.
     Look for the package's source code in directory DIR.  Usually
     `configure' can determine that directory automatically.
-`--version'
+`configure' also accepts some other, not widely useful, options.  Run
-     Print the version of Autoconf used to generate the `configure'
+`configure --help' for more details.
     script, and exit.
 `configure' also accepts some other, not widely useful, options.
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
 # @configure_input@
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +44,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,7 +59,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -66,7 +73,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -79,10 +86,8 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -132,9 +137,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	uninstall-info-recursive all-recursive install-data-recursive \
 	install-exec-recursive installdirs-recursive install-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
+DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \
-	INSTALL Makefile.am Makefile.in NEWS README-alpha THANKS \
+	Makefile.am Makefile.in NEWS THANKS aclocal.m4 config.hin \
-	aclocal.m4 config.hin configure configure.in
+	configure configure.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -144,44 +149,34 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$@ $(SHELL) ./config.status
 $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(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/mbrtowc.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/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
+
 config.h: stamp-h1
 	@if test ! -f $@; then \
-		rm -f stamp-h; \
+	  rm -f stamp-h1; \
-		$(MAKE) stamp-h; \
+	  $(MAKE) stamp-h1; \
 	else :; fi
-stamp-h: $(srcdir)/config.hin $(top_builddir)/config.status
+
-	@rm -f stamp-h stamp-hT
+stamp-h1: $(srcdir)/config.hin $(top_builddir)/config.status
-	@echo timestamp > stamp-hT 2> /dev/null
+	@rm -f stamp-h1
-	cd $(top_builddir) \
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.hin \
+
-	     $(SHELL) ./config.status
+$(srcdir)/config.hin:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	@mv stamp-hT stamp-h
 $(srcdir)/config.hin:  $(srcdir)/./stamp-h.in
 	@if test ! -f $@; then \
 		rm -f $(srcdir)/./stamp-h.in; \
 		$(MAKE) $(srcdir)/./stamp-h.in; \
 	else :; fi
 $(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	@rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
 	@echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
 	cd $(top_srcdir) && $(AUTOHEADER)
-	@mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
+	touch $(srcdir)/config.hin
 distclean-hdr:
 	-rm -f config.h
 intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 uninstall-info-am:
 # This directory's subdirectories are mostly independent; you can cd
@@ -269,7 +264,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) \
 	  || etags $(ETAGS_ARGS) $$tags config.hin $$unique $(LISP)
 GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
@@ -326,7 +321,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
-dist: distdir
+dist-gzip: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
@@ -334,6 +329,11 @@ dist-bzip2: distdir
 	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 dist 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)
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
@@ -344,7 +344,7 @@ distcheck: dist
 	mkdir $(distdir)/=build
 	mkdir $(distdir)/=inst
 	chmod a-w $(distdir)
-	dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
+	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
 	  && cd $(distdir)/=build \
 	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
 	    --with-included-gettext \
@@ -355,14 +355,16 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
 	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
-	     || (echo "Error: files left after uninstall" 1>&2; \
+	      || { echo "ERROR: files left after uninstall:" ; \
-	         exit 1) ) \
+	           find $$dc_install_base -type f -print ; \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	           exit 1; } >&2 ) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
 	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
 	  && rm -f $(distdir).tar.gz \
 	  && (test `find . -type f -print | wc -l` -eq 0 \
-	     || (echo "Error: files left after distclean" 1>&2; \
+	      || { echo "ERROR: files left after distclean:" ; \
-	         exit 1) )
+	           find . -type f -print ; \
 	           exit 1; } >&2 )
 	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
 	@echo "$(distdir).tar.gz is ready for distribution" | \
 	  sed 'h;s/./=/g;p;x;p;x'
@@ -400,10 +402,6 @@ clean: clean-recursive
 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
 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
@@ -440,7 +438,7 @@ uninstall-info: uninstall-info-recursive
 .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
 	clean-generic clean-recursive dist dist-all dist-bzip2 \
-	distcheck distclean distclean-generic distclean-hdr \
+	dist-gzip 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 \
@@ -1,7 +1,7 @@
 Bison News
 ----------
-Changes in version 1.29c:
+Changes in version 1.30:
 * `--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
@@ -16,7 +16,10 @@ Changes in version 1.29c:
 Changes in version 1.29:
-* Output file does not redefine const; that is now config.h's job.
+* The output file does not define const, as this caused problems when used
  with common autoconfiguration schemes.  If you still use ancient compilers
  that lack const, compile with the equivalent of the C compiler option
  `-Dconst='.  autoconf's AC_C_CONST macro provides one way to do this.
 * Added `-g' and `--graph'.
@@ -1,6 +1,7 @@
 Bison was originally written by Robert Corbett.  It would not be what
 it is today without the invaluable help of these people:
 Airy Andre              [email protected]
 Akim Demaille           [email protected]
 Albert Chin-A-Young     [email protected]
 Alexander Belopolsky    [email protected]
@@ -1,4 +1,4 @@
-# aclocal.m4 generated automatically by aclocal 1.5
+# aclocal.m4 generated automatically by aclocal 1.5a -*- Autoconf -*-
 # Copyright 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -11,11 +11,29 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
-# Do all the work for Automake.  This macro actually does too much --
+# Do all the work for Automake.                            -*- Autoconf -*-
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.
-# serial 5
+# This macro actually does too much some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 # Copyright 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)
 # 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.
 # 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.
 # serial 6
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -24,55 +42,29 @@
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-# We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.52])
 AC_PREREQ([2.13])
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
 # -----------------------------------------------------------
 # If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
 # The purpose of this macro is to provide the user with a means to
 # check macros which are provided without letting her know how the
 # information is coded.
 # If this macro is not defined by Autoconf, define it here.
 ifdef([AC_PROVIDE_IFELSE],
      [],
      [define([AC_PROVIDE_IFELSE],
              [ifdef([AC_PROVIDE_$1],
                     [$2], [$3])])])
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
 # ----------------------------------------------
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_REQUIRE([AC_PROG_INSTALL])dnl
 # test to see if srcdir already configured
-if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
   test -f $srcdir/config.status; then
  AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
 fi
 # Define the identity of the package.
-PACKAGE=$1
+AC_SUBST([PACKAGE], [$1])dnl
-AC_SUBST(PACKAGE)dnl
+AC_SUBST([VERSION], [$2])dnl
 VERSION=$2
 AC_SUBST(VERSION)dnl
 ifelse([$3],,
 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
 ifdef([m4_pattern_allow],
      [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
 # Autoconf 2.50 always computes EXEEXT.  However we need to be
 # compatible with 2.13, for now.  So we always define EXEEXT, but we
 # don't compute it.
 AC_SUBST(EXEEXT)
 # Similar for OBJEXT -- only we only use OBJEXT if the user actually
 # requests that it be used.  This is a bit dumb.
 : ${OBJEXT=o}
 AC_SUBST(OBJEXT)
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
@@ -105,6 +97,23 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
 # Check to make sure that the build environment is sane.
 #
 # Copyright 1996, 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)
 # 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.
 # 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.
 # serial 3
 # AM_SANITY_CHECK
@@ -148,6 +157,25 @@ Check your system clock])
 fi
 AC_MSG_RESULT(yes)])
 #  -*- Autoconf -*-
 # Copyright 1997, 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)
 # 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.
 # 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.
 # serial 2
@@ -178,6 +206,23 @@ fi
 # AM_AUX_DIR_EXPAND
 # Copyright 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)
 # 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.
 # 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.
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -216,19 +261,59 @@ fi
 # absolute PATH.  The drawback is that using absolute paths prevent a
 # configured tree to be moved without reconfiguration.
 # Rely on autoconf to set up CDPATH properly.
 AC_PREREQ([2.50])
 AC_DEFUN([AM_AUX_DIR_EXPAND], [
 # expand $ac_aux_dir to an absolute path
-am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
 # Copyright 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)
 # 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.
 # 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.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 # AM_PROG_INSTALL_STRIP
 # Copyright 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)
 # 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.
 # 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.
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -243,6 +328,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 # serial 4						-*- Autoconf -*-
 # Copyright 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)
 # 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.
 # 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.
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
@@ -254,7 +355,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 # _AM_DEPENDENCIES(NAME)
-# ---------------------
+# ----------------------
 # See how the compiler implements dependency checking.
 # NAME is "CC", "CXX" or "OBJC".
 # We try a few techniques and use that to set a single cache variable.
@@ -333,8 +434,7 @@ else
  am_cv_$1_dependencies_compiler_type=none
 fi
 ])
-$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
 AC_SUBST([$1DEPMODE])
 ])
@@ -352,7 +452,7 @@ else
  DEPDIR=_deps
 fi
 rmdir .deps 2>/dev/null
-AC_SUBST(DEPDIR)
+AC_SUBST([DEPDIR])
 ])
@@ -367,30 +467,40 @@ if test "x$enable_dependency_tracking" != xno; then
  AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-pushdef([subst], defn([AC_SUBST]))
+AC_SUBST([AMDEPBACKSLASH])
 subst(AMDEPBACKSLASH)
 popdef([subst])
 ])
-# Generate code to set up dependency tracking.
+# Generate code to set up dependency tracking.   -*- Autoconf -*-
 # This macro should only be invoked once -- use via AC_REQUIRE.
 # Usage:
 # AM_OUTPUT_DEPENDENCY_COMMANDS
-#
+# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
-# This code is only required when automatic dependency tracking
+
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# This program is free software; you can redistribute it and/or modify
-# need in order to bootstrap the dependency handling code.
+# it under the terms of the GNU General Public License as published by
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
+# the Free Software Foundation; either version 2, or (at your option)
-AC_OUTPUT_COMMANDS([
+# any later version.
-test x"$AMDEP_TRUE" != x"" ||
+
-for mf in $CONFIG_FILES; do
+# This program is distributed in the hope that it will be useful,
-  case "$mf" in
+# 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.
 # 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.
 #serial 2
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [for mf in $CONFIG_FILES; do
  case $mf in
  Makefile) dirpart=.;;
-  */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
+  */Makefile) dirpart=`AS_DIRNAME("$mf")`;;
  *) continue;;
  esac
-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
  # Extract the definition of DEP_FILES from the Makefile without
  # running `make'.
  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
@@ -414,18 +524,49 @@ for mf in $CONFIG_FILES; do
       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
    # Make sure the directory exists.
    test -f "$dirpart/$file" && continue
-    fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
+    fdir=`AS_DIRNAME(["$file"])`
-    $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
+    AS_MKDIR_P([$dirpart/$fdir])
    # echo "creating $dirpart/$file"
    echo '# dummy' > "$dirpart/$file"
  done
 done
-], [AMDEP_TRUE="$AMDEP_TRUE"
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-ac_aux_dir="$ac_aux_dir"])])
+
 # AM_OUTPUT_DEPENDENCY_COMMANDS
 # -----------------------------
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
 # is enabled.  FIXME.  This creates each `.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
 # Copyright 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)
 # 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.
 # 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.
 AC_DEFUN([AM_MAKE_INCLUDE],
 [am_make=${MAKE-make}
 cat > confinc << 'END'
@@ -464,23 +605,35 @@ AC_MSG_RESULT($_am_result)
 rm -f confinc confmf
 ])
-# serial 3
+# AM_CONDITIONAL                                              -*- Autoconf -*-
 # Copyright 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)
 # 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.
 # 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.
 # serial 5
 AC_PREREQ(2.52)
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 #
 # FIXME: Once using 2.50, use this:
 # m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_DEFUN([AM_CONDITIONAL],
-[ifelse([$1], [TRUE],
+[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-        [errprint(__file__:__line__: [$0: invalid condition: $1
+        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 ])dnl
 m4exit(1)])dnl
 ifelse([$1], [FALSE],
       [errprint(__file__:__line__: [$0: invalid condition: $1
 ])dnl
 m4exit(1)])dnl
 AC_SUBST([$1_TRUE])
 AC_SUBST([$1_FALSE])
 if $2; then
@@ -491,72 +644,83 @@ else
  $1_FALSE=
 fi])
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-# serial 3
+# Copyright 1996, 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)
 # 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.
 # 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.
 AC_PREREQ([2.52])
 # serial 6
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  We must strip everything past the first ":",
 # and everything past the last "/".
 AC_PREREQ([2.12])
 AC_DEFUN([AM_CONFIG_HEADER],
 [ifdef([AC_FOREACH],dnl
 	 [dnl init our file count if it isn't already
 	 m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
 	 dnl prepare to store our destination file list for use in config.status
 	 AC_FOREACH([_AM_File], [$1],
 		    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
 		    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
 		    dnl and add it to the list of files AC keeps track of, along
 		    dnl with our hook
 		    AC_CONFIG_HEADERS(_AM_File,
 dnl COMMANDS, [, INIT-CMDS]
 [# update the timestamp
 echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
 ][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
 		    m4_popdef([_AM_Dest])])],dnl
 [AC_CONFIG_HEADER([$1])
  AC_OUTPUT_COMMANDS(
   ifelse(patsubst([$1], [[^ ]], []),
 	  [],
 	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
 	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
 [am_indx=1
 for am_file in $1; do
  case " \$CONFIG_HEADERS " in
  *" \$am_file "*)
    am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
    if test -n "\$am_dir"; then
      am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
      for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
        am_tmpdir=\$am_tmpdir\$am_subdir/
        if test ! -d \$am_tmpdir; then
          mkdir \$am_tmpdir
        fi
      done
    fi
    echo timestamp > "\$am_dir"stamp-h\$am_indx
    ;;
  esac
  am_indx=\`expr \$am_indx + 1\`
 done])
 ])]) # AM_CONFIG_HEADER
 # _AM_DIRNAME(PATH)
 # -----------------
 # Like AS_DIRNAME, only do it during macro expansion
 AC_DEFUN([_AM_DIRNAME],
-       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+       [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
-	      m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
+	      m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
-		    m4_if(m4_regexp([$1], [^/.*]), -1,
+		    m4_if(regexp([$1], [^/.*]), -1,
 			  [.],
-			  m4_patsubst([$1], [^\(/\).*], [\1])),
+			  patsubst([$1], [^\(/\).*], [\1])),
-		    m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+		    patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
-	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+	      patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
-]) # _AM_DIRNAME
+])# _AM_DIRNAME
 # The stamp files are numbered to have different names.
 # We could number them on a directory basis, but that's additional
 # complications, let's have a unique counter.
 m4_define([_AM_STAMP_Count], [0])
 # _AM_STAMP(HEADER)
 # -----------------
 # The name of the stamp file for HEADER.
 AC_DEFUN([_AM_STAMP],
 [m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
 AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
                               [:.*])))/stamp-h[]_AM_STAMP_Count])
 # _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
 # ------------------------------------------------------------
 # We used to try to get a real timestamp in stamp-h.  But the fear is that
 # that will cause unnecessary cvs conflicts.
 AC_DEFUN([_AM_CONFIG_HEADER],
 [# Add the stamp file to the list of files AC keeps track of,
 # along with our hook.
 AC_CONFIG_HEADERS([$1],
                  [# update the timestamp
 echo 'timestamp for $1' >"_AM_STAMP([$1])"
 $2],
                  [$3])
 ])# _AM_CONFIG_HEADER
 # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
 # --------------------------------------------------------------
 AC_DEFUN([AM_CONFIG_HEADER],
 [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
 ])# AM_CONFIG_HEADER
 #serial 1
 # This test replaces the one in autoconf.
@@ -577,6 +741,23 @@ AC_DEFUN([AC_ISC_POSIX],
 )
 # Copyright 1996, 1997, 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)
 # 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.
 # 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.
 # serial 1
 # @defmac AC_PROG_CC_STDC
@@ -665,23 +846,6 @@ case "x$am_cv_prog_cc_stdc" in
 esac
 ])
 # serial 1                                                   -*- Autoconf -*-
 # BISON_AC_PROG_GNU_M4
 # --------------------
 # Check for GNU m4, at least 1.3 (supports frozen files).
 AC_DEFUN([BISON_AC_PROG_GNU_M4],
 [AC_PATH_PROGS(M4, gm4 gnum4 m4, m4)
 AC_CACHE_CHECK([whether m4 supports frozen files],
               [ac_cv_prog_gnu_m4],
 [ac_cv_prog_gnu_m4=no
 if test x"$M4" != x; then
  case `$M4 --help < /dev/null 2>&1` in
    *reload-state*) ac_cv_prog_gnu_m4=yes ;;
  esac
 fi])
 ])# BISON_AC_PROG_GNU_M4
 AC_DEFUN(BISON_WARNING,
 [AC_MSG_CHECKING(whether compiler accepts $1)
 AC_SUBST(WARNING_CFLAGS)
@@ -695,6 +859,23 @@ AC_MSG_RESULT(no))
 CFLAGS="$ac_save_CFLAGS"])
 # Copyright 1996, 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)
 # 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.
 # 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.
 # serial 1
 AC_DEFUN([AM_C_PROTOTYPES],
@@ -716,19 +897,19 @@ AC_SUBST(U)dnl
 AC_SUBST(ANSI2KNR)dnl
 ])
-#serial 3
+#serial 5
 dnl From Jim Meyering.
 dnl Determine whether malloc accepts 0 as its argument.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
-AC_DEFUN(jm_FUNC_MALLOC,
+AC_DEFUN([jm_FUNC_MALLOC],
 [
 dnl xmalloc.c requires that this symbol be defined so it doesn't
 dnl mistakenly use a broken malloc -- as it might if this test were omitted.
- AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
+ AC_DEFINE(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
-                    [Define if the malloc check has been performed. ])
+           [Define if the malloc check has been performed. ])
 AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
  [AC_TRY_RUN([
@@ -745,26 +926,25 @@ AC_DEFUN(jm_FUNC_MALLOC,
 	 jm_cv_func_working_malloc=no)
  ])
  if test $jm_cv_func_working_malloc = no; then
-    AC_SUBST(LIBOBJS)
+    AC_LIBOBJ(malloc)
-    LIBOBJS="$LIBOBJS malloc.$ac_objext"
+    AC_DEFINE(malloc, rpl_malloc,
    AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
      [Define to rpl_malloc if the replacement function should be used.])
  fi
 ])
-#serial 3
+#serial 5
 dnl From Jim Meyering.
 dnl Determine whether realloc works when both arguments are 0.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
-AC_DEFUN(jm_FUNC_REALLOC,
+AC_DEFUN([jm_FUNC_REALLOC],
 [
 dnl xmalloc.c requires that this symbol be defined so it doesn't
 dnl mistakenly use a broken realloc -- as it might if this test were omitted.
- AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
+ AC_DEFINE(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
-                    [Define if the realloc check has been performed. ])
+           [Define if the realloc check has been performed. ])
 AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
  [AC_TRY_RUN([
@@ -781,9 +961,8 @@ AC_DEFUN(jm_FUNC_REALLOC,
 	 jm_cv_func_working_realloc=no)
  ])
  if test $jm_cv_func_working_realloc = no; then
-    AC_SUBST(LIBOBJS)
+    AC_LIBOBJ(realloc)
-    LIBOBJS="$LIBOBJS realloc.$ac_objext"
+    AC_DEFINE(realloc, rpl_realloc,
    AC_DEFINE_UNQUOTED(realloc, rpl_realloc,
      [Define to rpl_realloc if the replacement function should be used.])
  fi
 ])
@@ -823,11 +1002,11 @@ AC_DEFUN([jm_FUNC_MBRTOWC],
  fi
 ])
-#serial 3
+#serial 4
 dnl From Paul Eggert.
-AC_DEFUN(AC_C_BACKSLASH_A,
+AC_DEFUN([AC_C_BACKSLASH_A],
 [
  AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a,
   [AC_TRY_COMPILE([],
@@ -847,7 +1026,7 @@ AC_DEFUN(AC_C_BACKSLASH_A,
  fi
 ])
-# serial 8
+# serial 9
 # From Paul Eggert.
@@ -859,7 +1038,7 @@ AC_DEFUN(AC_C_BACKSLASH_A,
 # (at least glibc-2.1.3) because the "_XOPEN_SOURCE 500" definition elicits
 # a syntax error in wchar.h due to the use of undefined __int32_t.
-AC_DEFUN(AC_MBSTATE_T,
+AC_DEFUN([AC_MBSTATE_T],
  [
   AC_CHECK_HEADERS(stdlib.h)
@@ -877,25 +1056,40 @@ AC_DEFUN(AC_MBSTATE_T,
 	       [Define to a type if <wchar.h> does not define.])
   fi])
-#serial 1
+#serial 4
 dnl FIXME: put these prerequisite-only *.m4 files in a separate
 dnl directory -- otherwise, they'll conflict with existing files.
 dnl These are the prerequisite macros for GNU's error.c file.
-AC_DEFUN(jm_PREREQ_ERROR,
+AC_DEFUN([jm_PREREQ_ERROR],
 [
-  AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
+  AC_CHECK_FUNCS(strerror vprintf doprnt)
-  AC_HEADER_STDC
+  AC_CHECK_DECLS([strerror])
  AC_FUNC_STRERROR_R
  AC_HEADER_STDC
 ])
-#serial 1002
+#serial 1003
 # Experimental replacement for the function in the latest CVS autoconf.
 # If the compile-test says strerror_r doesn't work, then resort to a
 # `run'-test that works on BeOS and segfaults on DEC Unix.
 # Use with the error.c file in ../lib.
 # Copyright 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)
 # 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.
 # 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.  */
 undefine([AC_FUNC_STRERROR_R])
 # AC_FUNC_STRERROR_R
@@ -903,57 +1097,36 @@ undefine([AC_FUNC_STRERROR_R])
 AC_DEFUN([AC_FUNC_STRERROR_R],
 [AC_CHECK_DECLS([strerror_r])
 AC_CHECK_FUNCS([strerror_r])
-if test $ac_cv_func_strerror_r = yes; then
+AC_CACHE_CHECK([whether strerror_r returns char *],
-  AC_CHECK_HEADERS(string.h)
+               ac_cv_func_strerror_r_char_p,
  AC_CACHE_CHECK([for working strerror_r],
                 ac_cv_func_strerror_r_works,
   [
-    AC_TRY_COMPILE(
+    ac_cv_func_strerror_r_char_p=no
-     [
+    if test $ac_cv_have_decl_strerror_r = yes; then
-#       include <stdio.h>
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
-#       if HAVE_STRING_H
+	[[
-#        include <string.h>
+	  char buf[100];
-#       endif
+	  char x = *strerror_r (0, buf, sizeof buf);
-     ],
+	  char *p = strerror_r (0, buf, sizeof buf);
-     [
+	]])],
-       char buf[100];
+			ac_cv_func_strerror_r_char_p=yes)
-       char x = *strerror_r (0, buf, sizeof buf);
+    else
-     ],
+      # strerror_r is not declared.  Choose between
     ac_cv_func_strerror_r_works=yes,
     ac_cv_func_strerror_r_works=no
    )
    if test $ac_cv_func_strerror_r_works = no; then
      # strerror_r seems not to work, but now we have to choose between
      # systems that have relatively inaccessible declarations for the
      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
      # former has a strerror_r that returns char*, while the latter
      # has a strerror_r that returns `int'.
      # This test should segfault on the DEC system.
-      AC_TRY_RUN(
+      AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
-       [
+	extern char *strerror_r ();],
-#       include <stdio.h>
+	[[char buf[100];
 #       include <string.h>
 #       include <ctype.h>
 	extern char *strerror_r ();
 	int
 	main ()
 	{
 	  char buf[100];
 	  char x = *strerror_r (0, buf, sizeof buf);
-	  exit (!isalpha (x));
+	  exit (!isalpha (x));]])],
-	}
+                    ac_cv_func_strerror_r_char_p=yes, , :)
       ],
       ac_cv_func_strerror_r_works=yes,
       ac_cv_func_strerror_r_works=no,
       ac_cv_func_strerror_r_works=no)
    fi
  ])
-  if test $ac_cv_func_strerror_r_works = yes; then
+if test $ac_cv_func_strerror_r_char_p = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_WORKING_STRERROR_R, 1,
+  AC_DEFINE([STRERROR_R_CHAR_P], 1,
-      [Define to 1 if `strerror_r' returns a string.])
+	    [Define to 1 if strerror_r returns char *.])
  fi
 fi
 ])# AC_FUNC_STRERROR_R
@@ -981,10 +1154,12 @@ fi], [AC_MSG_RESULT(no)])
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
+# License or the GNU Library General Public License but which still want
-# functionality.
+# to provide support for the GNU gettext functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
+# Please note that the actual code of the GNU gettext library is covered
-# General Public License and is *not* in the public domain.
+# by the GNU Library General Public License, and the rest of the GNU
 # gettext package package is covered by the GNU General Public License.
 # They are *not* in the public domain.
 # serial 10
@@ -1219,7 +1394,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
      dnl Found it, now check the version.
      AC_MSG_CHECKING([version of bison])
 changequote(<<,>>)dnl
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
      case $ac_prog_version in
        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
@@ -1350,10 +1525,12 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
+# License or the GNU Library General Public License but which still want
-# functionality.
+# to provide support for the GNU gettext functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
+# Please note that the actual code of the GNU gettext library is covered
-# General Public License and is *not* in the public domain.
+# by the GNU Library General Public License, and the rest of the GNU
 # gettext package package is covered by the GNU General Public License.
 # They are *not* in the public domain.
 # serial 2
@@ -1515,10 +1692,12 @@ AC_DEFUN([AM_LANGINFO_CODESET],
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
+# License or the GNU Library General Public License but which still want
-# functionality.
+# to provide support for the GNU gettext functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
+# Please note that the actual code of the GNU gettext library is covered
-# General Public License and is *not* in the public domain.
+# by the GNU Library General Public License, and the rest of the GNU
 # gettext package package is covered by the GNU General Public License.
 # They are *not* in the public domain.
 # serial 2
@@ -38,6 +38,10 @@
   */
 #undef HAVE_DECL_STPCPY
 /* Define to 1 if you have the declaration of `strerror', and to 0 if you
   don't. */
 #undef HAVE_DECL_STRERROR
 /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
   don't. */
 #undef HAVE_DECL_STRERROR_R
@@ -218,9 +222,6 @@
 /* Define if you have the <wctype.h> header file. */
 #undef HAVE_WCTYPE_H
 /* Define to 1 if `strerror_r' returns a string. */
 #undef HAVE_WORKING_STRERROR_R
 /* Define if you have the `__argz_count' function. */
 #undef HAVE___ARGZ_COUNT
@@ -250,6 +251,9 @@
 /* Define if you have the ANSI C header files. */
 #undef STDC_HEADERS
 /* Define to 1 if strerror_r returns char *. */
 #undef STRERROR_R_CHAR_P
 /* Version number of package */
 #undef VERSION
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
 # @configure_input@
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +44,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,7 +59,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -66,7 +73,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -79,10 +86,8 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -111,9 +116,7 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  config/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 uninstall-info-am:
 tags: TAGS
 TAGS:
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
-timestamp='2001-09-13'
+timestamp='2001-10-05'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,8 +24,9 @@ timestamp='2001-09-13'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
-# Written by Per Bothner <[email protected]>.
+# Originally written by Per Bothner <[email protected]>.
-# Please send patches to <[email protected]>.
+# Please send patches to <[email protected]>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -547,10 +548,8 @@ EOF
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
+		if [ -x /usr/bin/getconf ]; then
-                11.[0-9][0-9])
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                  if [ -x /usr/bin/getconf ]; then
                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                    case "${sc_cpu_version}" in
                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -559,13 +558,13 @@ EOF
                        case "${sc_kernel_bits}" in
                          32) HP_ARCH="hppa2.0n" ;;
                          64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                        esac ;;
                    esac
-                  fi ;;
+		fi
-              esac
+		if [ "${HP_ARCH}" = "" ]; then
-              if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
-	      eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
              sed 's/^              //' << EOF >$dummy.c
              #define _HPUX_SOURCE
              #include <stdlib.h>
@@ -598,10 +597,10 @@ EOF
                  exit (0);
              }
 EOF
-	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
-	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	    rm -f $dummy.c $dummy
+		    rm -f $dummy.c $dummy
-	fi ;;
+		fi ;;
 	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
@@ -948,7 +947,7 @@ EOF
 	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
-timestamp='2001-09-14'
+timestamp='2001-10-05'
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-09-14'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
-# Please send patches to <[email protected]>.
+# Please send patches to <[email protected]>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -725,7 +726,7 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
 	pentiumpro | p6 | 6x86 | athlon)
@@ -734,7 +735,7 @@ case $basic_machine in
 	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -796,7 +797,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
 # written by Ulrich Drepper <[email protected]>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,11 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # Prevent date giving response in another language.
 LANG=C
 export LANG
@@ -7,6 +7,52 @@
 # $Id$
 errstatus=0
 dirmode=""
 usage="\
 Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
 # process command line arguments
 while test $# -gt 0 ; do
   case "${1}" in
     -h | --help | --h* )			# -h for help
 	echo "${usage}" 1>&2; exit 0 ;;
     -m )					# -m PERM arg
 	shift
 	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
 	dirmode="${1}"
 	shift ;;
     -- ) shift; break ;;			# stop option processing
     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
     * )  break ;;				# first non-opt arg
   esac
 done
 for file
 do
  if test -d "$file"; then
    shift
  else
    break
  fi
 done
 case $# in
 0) exit 0 ;;
 esac
 case $dirmode in
 '')
  if mkdir -p -- . 2>/dev/null; then
    echo "mkdir -p -- $*"
    exec mkdir -p -- "$@"
  fi ;;
 *)
  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
    echo "mkdir -m $dirmode -p -- $*"
    exec mkdir -m "$dirmode" -p -- "$@"
  fi ;;
 esac
 for file
 do
@@ -22,13 +68,24 @@ do
     esac
     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
+	echo "mkdir $pathcomp"
-        mkdir "$pathcomp" || lasterr=$?
+	mkdir "$pathcomp" || lasterr=$?
-        if test ! -d "$pathcomp"; then
+	if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
+	  errstatus=$lasterr
-        fi
+	else
 	  if test ! -z "$dirmode"; then
 	     echo "chmod $dirmode $pathcomp"
 	     lasterr=""
 	     chmod "$dirmode" "$pathcomp" || lasterr=$?
 	     if test ! -z "$lasterr"; then
 	       errstatus=$lasterr
 	     fi
 	  fi
 	fi
     fi
     pathcomp="$pathcomp/"
@@ -37,4 +94,8 @@ done
 exit $errstatus
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 3
 # End:
 # mkinstalldirs ends here
@@ -1 +1 @@
-1.29b
+1.28
@@ -18,15 +18,17 @@
 # We need a recent Autoconf to run a recent Autotest.
 AC_PREREQ(2.52e)
-AC_INIT([GNU Bison], [1.29c], [[email protected]])
+AC_INIT([GNU Bison], [1.30], [[email protected]])
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE([bison], [1.29c])
+AM_INIT_AUTOMAKE([bison], [1.30])
 AM_CONFIG_HEADER(config.h:config.hin)
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 # Needed by tests/atlocal.in.
 AC_SUBST([GCC])
 # Checks for programs.
 AC_PROG_CC
@@ -34,12 +36,7 @@ AC_MINIX
 AC_ISC_POSIX
 AM_PROG_CC_STDC
 AC_PROG_RANLIB
-# GNU M4 is needed to build the testsuite.
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
 BISON_AC_PROG_GNU_M4
 if test "$ac_cv_prog_gnu_m4" != yes; then
  missing_dir=`cd $ac_aux_dir && pwd`
  M4="$missing_dir/missing m4"
 fi
 AC_ARG_ENABLE(gcc-warnings,
 [  --enable-gcc-warnings   turn on lots of GCC warnings (not recommended)],
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
 # @configure_input@
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +44,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,7 +59,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -66,7 +73,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -79,10 +86,8 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -127,9 +132,7 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  doc/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 $(srcdir)/version.texi:  $(srcdir)/stamp-vti
 	@:
@@ -161,7 +164,7 @@ bison.dvi: bison.texinfo $(srcdir)/version.texi $(bison_TEXINFOS)
 	       `echo $< | sed 's,.*/,,'`
 .texinfo.dvi:
-	TEXINPUTS=$(top_srcdir)/config:$$TEXINPUTS \
+	TEXINPUTS="$(top_srcdir)/config$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
 	$(TEXI2DVI) $<
@@ -200,9 +203,10 @@ dist-info: $(INFO_DEPS)
 	list='$(INFO_DEPS)'; \
 	for base in $$list; do \
 	  d=$(srcdir); \
-	  for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \
+	  for file in $$d/$$base*; do \
-	    test -f $(distdir)/$$file \
+	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-	    || cp -p $$d/$$file $(distdir)/$$file; \
+	    test -f $(distdir)/$$relfile || \
 	      cp -p $$file $(distdir)/$$relfile; \
 	  done; \
 	done
@@ -344,10 +348,11 @@ install-info-am: $(INFO_DEPS)
 	@list='$(INFO_DEPS)'; \
 	for file in $$list; do \
 	  d=$(srcdir); \
-	  for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	  for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
-	    if test -f $$d/$$ifile; then \
+	    if test -f $$ifile; then \
-	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+	      relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \
-	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+	      echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
 	      $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
 	    else : ; fi; \
 	  done; \
 	done
@@ -31,115 +31,115 @@ instead of in the original English.
 Indirect:
 bison.info-1: 1313
-bison.info-2: 50691
+bison.info-2: 50689
-bison.info-3: 100581
+bison.info-3: 100579
-bison.info-4: 150131
+bison.info-4: 150129
-bison.info-5: 197908
+bison.info-5: 197906
 Tag Table:
 (Indirect)
 Node: Top1313
-Node: Introduction8969
+Node: Introduction8968
-Node: Conditions10244
+Node: Conditions10242
-Node: Copying11708
+Node: Copying11706
-Node: Concepts30911
+Node: Concepts30909
-Node: Language and Grammar31990
+Node: Language and Grammar31988
-Node: Grammar in Bison37006
+Node: Grammar in Bison37004
-Node: Semantic Values38930
+Node: Semantic Values38928
-Node: Semantic Actions41031
+Node: Semantic Actions41029
-Node: Locations Overview42220
+Node: Locations Overview42218
-Node: Bison Parser43667
+Node: Bison Parser43665
-Node: Stages45979
+Node: Stages45977
-Node: Grammar Layout47262
+Node: Grammar Layout47260
-Node: Examples48519
+Node: Examples48517
-Node: RPN Calc49717
+Node: RPN Calc49715
-Node: Rpcalc Decls50691
+Node: Rpcalc Decls50689
-Node: Rpcalc Rules52278
+Node: Rpcalc Rules52276
-Node: Rpcalc Input54078
+Node: Rpcalc Input54076
-Node: Rpcalc Line55539
+Node: Rpcalc Line55537
-Node: Rpcalc Expr56654
+Node: Rpcalc Expr56652
-Node: Rpcalc Lexer58599
+Node: Rpcalc Lexer58597
-Node: Rpcalc Main61171
+Node: Rpcalc Main61169
-Node: Rpcalc Error61569
+Node: Rpcalc Error61567
-Node: Rpcalc Gen62577
+Node: Rpcalc Gen62575
-Node: Rpcalc Compile63726
+Node: Rpcalc Compile63724
-Node: Infix Calc64601
+Node: Infix Calc64599
-Node: Simple Error Recovery67308
+Node: Simple Error Recovery67306
-Node: Location Tracking Calc69197
+Node: Location Tracking Calc69195
-Node: Ltcalc Decls69927
+Node: Ltcalc Decls69925
-Node: Ltcalc Rules70836
+Node: Ltcalc Rules70834
-Node: Ltcalc Lexer72897
+Node: Ltcalc Lexer72895
-Node: Multi-function Calc75235
+Node: Multi-function Calc75233
-Node: Mfcalc Decl76802
+Node: Mfcalc Decl76800
-Node: Mfcalc Rules78825
+Node: Mfcalc Rules78823
-Node: Mfcalc Symtab80205
+Node: Mfcalc Symtab80203
-Node: Exercises86578
+Node: Exercises86576
-Node: Grammar File87084
+Node: Grammar File87082
-Node: Grammar Outline87932
+Node: Grammar Outline87930
-Node: C Declarations88666
+Node: C Declarations88664
-Node: Bison Declarations89246
+Node: Bison Declarations89244
-Node: Grammar Rules89658
+Node: Grammar Rules89656
-Node: C Code90118
+Node: C Code90116
-Node: Symbols91048
+Node: Symbols91046
-Node: Rules96129
+Node: Rules96127
-Node: Recursion97768
+Node: Recursion97766
-Node: Semantics99487
+Node: Semantics99485
-Node: Value Type100581
+Node: Value Type100579
-Node: Multiple Types101253
+Node: Multiple Types101251
-Node: Actions102270
+Node: Actions102268
-Node: Action Types105055
+Node: Action Types105053
-Node: Mid-Rule Actions106358
+Node: Mid-Rule Actions106356
-Node: Locations111928
+Node: Locations111926
-Node: Location Type112576
+Node: Location Type112574
-Node: Actions and Locations113134
+Node: Actions and Locations113132
-Node: Location Default Action115290
+Node: Location Default Action115288
-Node: Declarations116753
+Node: Declarations116751
-Node: Token Decl118072
+Node: Token Decl118070
-Node: Precedence Decl120085
+Node: Precedence Decl120083
-Node: Union Decl121636
+Node: Union Decl121634
-Node: Type Decl122480
+Node: Type Decl122478
-Node: Expect Decl123386
+Node: Expect Decl123384
-Node: Start Decl124932
+Node: Start Decl124930
-Node: Pure Decl125310
+Node: Pure Decl125308
-Node: Decl Summary126987
+Node: Decl Summary126985
-Node: Multiple Parsers132370
+Node: Multiple Parsers132368
-Node: Interface133864
+Node: Interface133862
-Node: Parser Function134736
+Node: Parser Function134734
-Node: Lexical135571
+Node: Lexical135569
-Node: Calling Convention136977
+Node: Calling Convention136975
-Node: Token Values139748
+Node: Token Values139746
-Node: Token Positions140897
+Node: Token Positions140895
-Node: Pure Calling141782
+Node: Pure Calling141780
-Node: Error Reporting144714
+Node: Error Reporting144712
-Node: Action Features146836
+Node: Action Features146834
-Node: Algorithm150131
+Node: Algorithm150129
-Node: Look-Ahead152424
+Node: Look-Ahead152422
-Node: Shift/Reduce154556
+Node: Shift/Reduce154554
-Node: Precedence157468
+Node: Precedence157466
-Node: Why Precedence158119
+Node: Why Precedence158117
-Node: Using Precedence159984
+Node: Using Precedence159982
-Node: Precedence Examples160952
+Node: Precedence Examples160950
-Node: How Precedence161653
+Node: How Precedence161651
-Node: Contextual Precedence162802
+Node: Contextual Precedence162800
-Node: Parser States164593
+Node: Parser States164591
-Node: Reduce/Reduce165836
+Node: Reduce/Reduce165834
-Node: Mystery Conflicts169397
+Node: Mystery Conflicts169395
-Node: Stack Overflow172783
+Node: Stack Overflow172781
-Node: Error Recovery174156
+Node: Error Recovery174154
-Node: Context Dependency179292
+Node: Context Dependency179290
-Node: Semantic Tokens180140
+Node: Semantic Tokens180138
-Node: Lexical Tie-ins183157
+Node: Lexical Tie-ins183155
-Node: Tie-in Recovery184705
+Node: Tie-in Recovery184703
-Node: Debugging186877
+Node: Debugging186875
-Node: Invocation190178
+Node: Invocation190176
-Node: Bison Options191430
+Node: Bison Options191428
-Node: Environment Variables195398
+Node: Environment Variables195396
-Node: Option Cross Key196246
+Node: Option Cross Key196244
-Node: VMS Invocation197124
+Node: VMS Invocation197122
-Node: Table of Symbols197908
+Node: Table of Symbols197906
-Node: Glossary205547
+Node: Glossary205545
-Node: Copying This Manual211851
+Node: Copying This Manual211849
-Node: GNU Free Documentation License212060
+Node: GNU Free Documentation License212058
-Node: Index231925
+Node: Index231923
 End Tag Table
@@ -34,7 +34,7 @@ File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Bison
 *****
-   This manual documents version 1.29c of Bison, updated 20 September
+   This manual documents version 1.30 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.29c of Bison.
+   This edition corresponds to version 1.30 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.29c
+@set EDITION 1.30
-@set VERSION 1.29c
+@set VERSION 1.30
@@ -1,4 +1,4 @@
@set UPDATED 20 September 2001
@set UPDATED-MONTH September 2001
-@set EDITION 1.29c
+@set EDITION 1.30
-@set VERSION 1.29c
+@set VERSION 1.30
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
 # @configure_input@
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +44,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,7 +59,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -66,7 +73,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -79,10 +86,8 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -161,9 +166,7 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 AR = ar
@@ -189,7 +192,7 @@ clean-krextra:
 	-rm -f ansi2knr
 mostlyclean-kr:
-	-rm -f *_.c
+	-test "$U" = "" || rm -f *_.c
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/error$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt$U.Po@am__quote@
@@ -286,7 +289,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
 GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1997, 1998 Aladdin Enterprises.  All rights reserved. */
+/* Copyright (C) 1989, 2000 Aladdin Enterprises.  All rights reserved. */
 /*$Id$*/
 /* Convert ANSI C function definitions to K&R ("traditional C") syntax */
@@ -37,27 +37,62 @@ program under the GPL.
 * There are no error messages.
 *
 * ansi2knr recognizes function definitions by seeing a non-keyword
- * identifier at the left margin, followed by a left parenthesis,
+ * identifier at the left margin, followed by a left parenthesis, with a
- * with a right parenthesis as the last character on the line,
+ * right parenthesis as the last character on the line, and with a left
- * and with a left brace as the first token on the following line
+ * brace as the first token on the following line (ignoring possible
- * (ignoring possible intervening comments), except that a line
+ * intervening comments and/or preprocessor directives), except that a line
 * consisting of only
 *	identifier1(identifier2)
 * will not be considered a function definition unless identifier2 is
- * the word "void".  ansi2knr will recognize a multi-line header provided
+ * the word "void", and a line consisting of
- * that no intervening line ends with a left or right brace or a semicolon.
+ *	identifier1(identifier2, <<arbitrary>>)
- * These algorithms ignore whitespace and comments, except that
+ * will not be considered a function definition.
- * the function name must be the first thing on the line.
+ * ansi2knr will recognize a multi-line header provided that no intervening
- * The following constructs will confuse it:
+ * line ends with a left or right brace or a semicolon.  These algorithms
 * ignore whitespace, comments, and preprocessor directives, except that
 * the function name must be the first thing on the line.  The following
 * constructs will confuse it:
 *	- Any other construct that starts at the left margin and
 *	    follows the above syntax (such as a macro or function call).
- *	- Some macros that tinker with the syntax of the function header.
+ *	- Some macros that tinker with the syntax of function headers.
 */
 /*
 * The original and principal author of ansi2knr is L. Peter Deutsch
 * <[email protected]>.  Other authors are noted in the change history
 * that follows (in reverse chronological order):
 	lpd 2000-04-12 backs out Eggert's changes because of bugs:
 	- concatlits didn't declare the type of its bufend argument;
 	- concatlits didn't't recognize when it was inside a comment;
 	- scanstring could scan backward past the beginning of the string; when
 	- the check for \ + newline in scanstring was unnecessary.
 	2000-03-05  Paul Eggert  <[email protected]>
 	Add support for concatenated string literals.
 	* ansi2knr.c (concatlits): New decl.
 	(main): Invoke concatlits to concatenate string literals.
 	(scanstring): Handle backslash-newline correctly.  Work with
 	character constants.  Fix bug when scanning backwards through
 	backslash-quote.  Check for unterminated strings.
 	(convert1): Parse character constants, too.
 	(appendline, concatlits): New functions.
 	* ansi2knr.1: Document this.
 	lpd 1999-08-17 added code to allow preprocessor directives
 		wherever comments are allowed
 	lpd 1999-04-12 added minor fixes from Pavel Roskin
 		<[email protected]> for clean compilation with
 		gcc -W -Wall
 	lpd 1999-03-22 added hack to recognize lines consisting of
 		identifier1(identifier2, xxx) as *not* being procedures
 	lpd 1999-02-03 made indentation of preprocessor commands consistent
 	lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an
 		endless loop; quoted strings within an argument list
 		confused the parser
 	lpd 1999-01-24 added a check for write errors on the output,
 		suggested by Jim Meyering <[email protected]>
 	lpd 1998-11-09 added further hack to recognize identifier(void)
 		as being a procedure
 	lpd 1998-10-23 added hack to recognize lines consisting of
@@ -153,19 +188,24 @@ program under the GPL.
 #endif
 /* Define NULL (for *very* old compilers). */
 #ifndef NULL
 # define NULL (0)
 #endif
 /*
 * The ctype macros don't always handle 8-bit characters correctly.
 * Compensate for this here.
 */
 #ifdef isascii
-#  undef HAVE_ISASCII		/* just in case */
+# undef HAVE_ISASCII		/* just in case */
-#  define HAVE_ISASCII 1
+# define HAVE_ISASCII 1
 #else
 #endif
 #if STDC_HEADERS || !HAVE_ISASCII
-#  define is_ascii(c) 1
+# define is_ascii(c) 1
 #else
-#  define is_ascii(c) isascii(c)
+# define is_ascii(c) isascii(c)
 #endif
 #define is_space(c) (is_ascii(c) && isspace(c))
@@ -177,7 +217,10 @@ program under the GPL.
 #define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
 /* Forward references */
 char *ppdirforward();
 char *ppdirbackward();
 char *skipspace();
 char *scanstring();
 int writeblanks();
 int test1();
 int convert1();
@@ -190,6 +233,8 @@ main(argc, argv)
 {	FILE *in = stdin;
 	FILE *out = stdout;
 	char *filename = 0;
 	char *program_name = argv[0];
 	char *output_name = 0;
 #define bufsize 5000			/* arbitrary size */
 	char *buf;
 	char *line;
@@ -205,6 +250,7 @@ main(argc, argv)
 	 * check for this switch for backward compatibility.
 	 */
 	int convert_varargs = 1;
 	int output_error;
 	while ( argc > 1 && argv[1][0] == '-' ) {
 	  if ( !strcmp(argv[1], "--varargs") ) {
@@ -219,7 +265,8 @@ main(argc, argv)
 	    argv += 2;
 	    continue;
 	  }
-	  fprintf(stderr, "Unrecognized switch: %s\n", argv[1]);
+	  fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name,
 		  argv[1]);
 	  fprintf(stderr, usage);
 	  exit(1);
 	}
@@ -229,16 +276,19 @@ main(argc, argv)
 		fprintf(stderr, usage);
 		exit(0);
 	case 3:
-		out = fopen(argv[2], "w");
+		output_name = argv[2];
 		out = fopen(output_name, "w");
 		if ( out == NULL ) {
-		  fprintf(stderr, "Cannot open output file %s\n", argv[2]);
+		  fprintf(stderr, "%s: Cannot open output file %s\n",
 			  program_name, output_name);
 		  exit(1);
 		}
 		/* falls through */
 	case 2:
 		in = fopen(argv[1], "r");
 		if ( in == NULL ) {
-		  fprintf(stderr, "Cannot open input file %s\n", argv[1]);
+		  fprintf(stderr, "%s: Cannot open input file %s\n",
 			  program_name, argv[1]);
 		  exit(1);
 		}
 		if ( filename == 0 )
@@ -250,6 +300,11 @@ main(argc, argv)
 	if ( filename )
 	  fprintf(out, "#line 1 \"%s\"\n", filename);
 	buf = malloc(bufsize);
 	if ( buf == NULL )
 	   {
 		fprintf(stderr, "Unable to allocate read buffer!\n");
 		exit(1);
 	   }
 	line = buf;
 	while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
 	   {
@@ -266,7 +321,7 @@ f:			if ( line >= buf + (bufsize - 1) ) /* overflow check */
 			  goto wl;
 			if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
 			  goto wl;
-			switch ( *skipspace(more, 1) )
+			switch ( *skipspace(ppdirforward(more), 1) )
 			  {
 			  case '{':
 			    /* Definitely a function header. */
@@ -300,32 +355,91 @@ wl:			fputs(buf, out);
 	if ( line != buf )
 	  fputs(buf, out);
 	free(buf);
-	if ( out != stdout )
+	if ( output_name ) {
-	  fclose(out);
+	  output_error = ferror(out);
 	  output_error |= fclose(out);
 	} else {		/* out == stdout */
 	  fflush(out);
 	  output_error = ferror(out);
 	}
 	if ( output_error ) {
 	  fprintf(stderr, "%s: error writing to %s\n", program_name,
 		  (output_name ? output_name : "stdout"));
 	  exit(1);
 	}
 	if ( in != stdin )
 	  fclose(in);
 	return 0;
 }
-/* Skip over space and comments, in either direction. */
+/*
 * Skip forward or backward over one or more preprocessor directives.
 */
 char *
 ppdirforward(p)
    char *p;
 {
    for (; *p == '#'; ++p) {
 	for (; *p != '\r' && *p != '\n'; ++p)
 	    if (*p == 0)
 		return p;
 	if (*p == '\r' && p[1] == '\n')
 	    ++p;
    }
    return p;
 }
 char *
 ppdirbackward(p, limit)
    char *p;
    char *limit;
 {
    char *np = p;
    for (;; p = --np) {
 	if (*np == '\n' && np[-1] == '\r')
 	    --np;
 	for (; np > limit && np[-1] != '\r' && np[-1] != '\n'; --np)
 	    if (np[-1] == 0)
 		return np;
 	if (*np != '#')
 	    return p;
    }
 }
 /*
 * Skip over whitespace, comments, and preprocessor directives,
 * in either direction.
 */
 char *
 skipspace(p, dir)
-    register char *p;
+    char *p;
-    register int dir;			/* 1 for forward, -1 for backward */
+    int dir;			/* 1 for forward, -1 for backward */
-{	for ( ; ; )
+{
-	   {	while ( is_space(*p) )
+    for ( ; ; ) {
-		  p += dir;
+	while ( is_space(*p) )
-		if ( !(*p == '/' && p[dir] == '*') )
+	    p += dir;
-		  break;
+	if ( !(*p == '/' && p[dir] == '*') )
-		p += dir;  p += dir;
+	    break;
-		while ( !(*p == '*' && p[dir] == '/') )
+	p += dir;  p += dir;
-		   {	if ( *p == 0 )
+	while ( !(*p == '*' && p[dir] == '/') ) {
-			  return p;	/* multi-line comment?? */
+	    if ( *p == 0 )
-			p += dir;
+		return p;	/* multi-line comment?? */
-		   }
+	    p += dir;
-		p += dir;  p += dir;
+	}
-	   }
+	p += dir;  p += dir;
-	return p;
+    }
    return p;
 }
 /* Scan over a quoted string, in either direction. */
 char *
 scanstring(p, dir)
    char *p;
    int dir;
 {
    for (p += dir; ; p += dir)
 	if (*p == '"' && p[-dir] != '\\')
 	    return p + dir;
 }
 /*
@@ -359,14 +473,14 @@ writeblanks(start, end)
 int
 test1(buf)
    char *buf;
-{	register char *p = buf;
+{	char *p = buf;
 	char *bend;
 	char *endfn;
 	int contin;
 	if ( !isidfirstchar(*p) )
 	  return 0;		/* no name at left margin */
-	bend = skipspace(buf + strlen(buf) - 1, -1);
+	bend = skipspace(ppdirbackward(buf + strlen(buf) - 1, buf), -1);
 	switch ( *bend )
 	   {
 	   case ';': contin = 0 /*2*/; break;
@@ -396,7 +510,7 @@ test1(buf)
 		   };
 		char **key = words;
 		char *kp;
-		int len = endfn - buf;
+		unsigned len = endfn - buf;
 		while ( (kp = *key) != 0 )
 		   {	if ( strlen(kp) == len && !strncmp(kp, buf, len) )
@@ -409,14 +523,16 @@ test1(buf)
 	       int len;
 	       /*
 		* Check for identifier1(identifier2) and not
-		* identifier1(void).
+		* identifier1(void), or identifier1(identifier2, xxxx).
 		*/
 	       while ( isidchar(*p) )
 		   p++;
 	       len = p - id;
 	       p = skipspace(p, 1);
-	       if ( *p == ')' && (len != 4 || strncmp(id, "void", 4)) )
+	       if (*p == ',' ||
 		   (*p == ')' && (len != 4 || strncmp(id, "void", 4)))
 		   )
 		   return 0;	/* not a function */
 	   }
 	/*
@@ -443,7 +559,7 @@ convert1(buf, out, header, convert_varargs)
    int header;			/* Boolean */
    int convert_varargs;	/* Boolean */
 {	char *endfn;
-	register char *p;
+	char *p;
 	/*
 	 * The breaks table contains pointers to the beginning and end
 	 * of each argument.
@@ -461,7 +577,7 @@ convert1(buf, out, header, convert_varargs)
 	  ;
 top:	p = endfn;
 	breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
-	if ( breaks == 0 )
+	if ( breaks == NULL )
 	   {	/* Couldn't allocate break table, give up */
 		fprintf(stderr, "Unable to allocate break table!\n");
 		fputs(buf, out);
@@ -473,7 +589,7 @@ top:	p = endfn;
 	do
 	   {	int level = 0;
 		char *lp = NULL;
-		char *rp;
+		char *rp = NULL;
 		char *end = NULL;
 		if ( bp >= btop )
@@ -500,14 +616,18 @@ top:	p = endfn;
 				else rp = p;
 				break;
 			   case '/':
-				p = skipspace(p, 1) - 1;
+				if (p[1] == '*')
 				    p = skipspace(p, 1) - 1;
 				break;
 			   case '"':
 			       p = scanstring(p, 1) - 1;
 			       break;
 			   default:
 				;
 			   }
 		   }
 		/* Erase any embedded prototype parameters. */
-		if ( lp )
+		if ( lp && rp )
 		  writeblanks(lp + 1, rp);
 		p--;			/* back up over terminator */
 		/* Find the name being declared. */
@@ -523,9 +643,19 @@ top:	p = endfn;
 				while ( level )
 				 switch ( *--p )
 				   {
-				   case ']': case ')': level++; break;
+				   case ']': case ')':
-				   case '[': case '(': level--; break;
+				       level++;
-				   case '/': p = skipspace(p, -1) + 1; break;
+				       break;
 				   case '[': case '(':
 				       level--;
 				       break;
 				   case '/':
 				       if (p > buf && p[-1] == '*')
 					   p = skipspace(p, -1) + 1;
 				       break;
 				   case '"':
 				       p = scanstring(p, -1) + 1;
 				       break;
 				   default: ;
 				   }
 			   }
@@ -1,23 +1,22 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000, 2001 Free Software Foundation, Inc.
   This file is part of the GNU C Library.  Its master source is NOT part of
   the C library, however.  The master source lives in /gd/gnu/lib.
   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
+   modify it under the terms of the GNU Lesser General Public
-   published by the Free Software Foundation; either version 2 of the
+   License as published by the Free Software Foundation; either
-   License, or (at your option) any later version.
+   version 2.1 of the License, or (at your option) any later version.
   The GNU C Library 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.
+   Lesser General Public License for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   License along with the GNU C Library; if not, write to the Free
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   Boston, MA 02111-1307, USA.  */
+   02111-1307 USA.  */
 /* Written by David MacKenzie <[email protected]>.  */
@@ -29,6 +28,10 @@
 #if HAVE_LIBINTL_H
 # include <libintl.h>
 #endif
 #ifdef _LIBC
 # include <wchar.h>
 # define mbsrtowcs __mbsrtowcs
 #endif
 #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
 # if __STDC__
@@ -52,13 +55,6 @@ void exit ();
 #include "error.h"
 #ifndef HAVE_DECL_STRERROR_R
 "this configure-time declaration test was not run"
 #endif
 #if !HAVE_DECL_STRERROR_R
 char *strerror_r ();
 #endif
 #ifndef _
 # define _(String) String
 #endif
@@ -83,6 +79,12 @@ unsigned int error_message_count;
 /* In GNU libc we want do not want to use the common name `error' directly.
   Instead make it a weak alias.  */
 extern void __error (int status, int errnum, const char *message, ...)
     __attribute__ ((__format__ (__printf__, 3, 4)));
 extern void __error_at_line (int status, int errnum, const char *file_name,
 			     unsigned int line_number, const char *message,
 			     ...)
     __attribute__ ((__format__ (__printf__, 5, 6)));;
 # define error __error
 # define error_at_line __error_at_line
@@ -93,21 +95,30 @@ unsigned int error_message_count;
 #else /* not _LIBC */
 # if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
 #  ifndef HAVE_DECL_STRERROR_R
 "this configure-time declaration test was not run"
 #  endif
 char *strerror_r ();
 # endif
 /* The calling program should define program_name and set it to the
   name of the executing program.  */
 extern char *program_name;
-# ifdef HAVE_STRERROR_R
+# if HAVE_STRERROR_R || defined strerror_r
 #  define __strerror_r strerror_r
 # else
 #  if HAVE_STRERROR
-#   ifndef strerror		/* On some systems, strerror is a macro */
+#   ifndef HAVE_DECL_STRERROR
 "this configure-time declaration test was not run"
 #   endif
 #   if !HAVE_DECL_STRERROR
 char *strerror ();
 #   endif
 #  else
 static char *
-private_strerror (errnum)
+private_strerror (int errnum)
     int errnum;
 {
  extern char *sys_errlist[];
  extern int sys_nerr;
@@ -118,15 +129,118 @@ private_strerror (errnum)
 }
 #   define strerror private_strerror
 #  endif /* HAVE_STRERROR */
-# endif	/* HAVE_STRERROR_R */
+# endif	/* HAVE_STRERROR_R || defined strerror_r */
 #endif	/* not _LIBC */
 static void
 print_errno_message (int errnum)
 {
  char const *s;
 #if defined HAVE_STRERROR_R || _LIBC
  char errbuf[1024];
 # if STRERROR_R_CHAR_P || _LIBC
  s = __strerror_r (errnum, errbuf, sizeof errbuf);
 # else
  if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
    s = errbuf;
  else
    s = 0;
 # endif
 #else
  s = strerror (errnum);
 #endif
 #if !_LIBC
  if (! s)
    s = _("Unknown system error");
 #endif
 #if _LIBC && USE_IN_LIBIO
  if (_IO_fwide (stderr, 0) > 0)
    {
      __fwprintf (stderr, L": %s", s);
      return;
    }
 #endif
  fprintf (stderr, ": %s", s);
 }
 #ifdef VA_START
 static void
 error_tail (int status, int errnum, const char *message, va_list args)
 {
 # if HAVE_VPRINTF || _LIBC
 #  if _LIBC && USE_IN_LIBIO
  if (_IO_fwide (stderr, 0) > 0)
    {
 #   define ALLOCA_LIMIT	2000
      size_t len = strlen (message) + 1;
      wchar_t *wmessage = NULL;
      mbstate_t st;
      size_t res;
      const char *tmp;
      do
 	{
 	  if (len < ALLOCA_LIMIT)
 	    wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
 	  else
 	    {
 	      if (wmessage != NULL && len / 2 < ALLOCA_LIMIT)
 		wmessage = NULL;
 	      wmessage = (wchar_t *) realloc (wmessage,
 					      len * sizeof (wchar_t));
 	      if (wmessage == NULL)
 		{
 		  fputws_unlocked (L"out of memory\n", stderr);
 		  return;
 		}
 	    }
 	  memset (&st, '\0', sizeof (st));
 	  tmp =message;
 	}
      while ((res = mbsrtowcs (wmessage, &tmp, len, &st)) == len);
      if (res == (size_t) -1)
 	/* The string cannot be converted.  */
 	wmessage = (wchar_t *) L"???";
      __vfwprintf (stderr, wmessage, args);
    }
  else
 #  endif
    vfprintf (stderr, message, args);
 # else
  _doprnt (message, args, stderr);
 # endif
  va_end (args);
  ++error_message_count;
  if (errnum)
    print_errno_message (errnum);
 # if _LIBC && USE_IN_LIBIO
  if (_IO_fwide (stderr, 0) > 0)
    putwc (L'\n', stderr);
  else
 # endif
    putc ('\n', stderr);
  fflush (stderr);
  if (status)
    exit (status);
 }
 #endif
 /* Print the program name and error message MESSAGE, which is a printf-style
   format string with optional args.
   If ERRNUM is nonzero, print its corresponding system error message.
   Exit with status STATUS if it is nonzero.  */
 /* VARARGS */
 void
 #if defined VA_START && __STDC__
 error (int status, int errnum, const char *message, ...)
@@ -142,47 +256,48 @@ error (status, errnum, message, va_alist)
  va_list args;
 #endif
  fflush (stdout);
 #ifdef _LIBC
 # ifdef USE_IN_LIBIO
  _IO_flockfile (stderr);
 # else
  __flockfile (stderr);
 # endif
 #endif
  if (error_print_progname)
    (*error_print_progname) ();
  else
    {
-      fflush (stdout);
+#if _LIBC && USE_IN_LIBIO
-      fprintf (stderr, "%s: ", program_name);
+      if (_IO_fwide (stderr, 0) > 0)
 	__fwprintf (stderr, L"%s: ", program_name);
      else
 #endif
 	fprintf (stderr, "%s: ", program_name);
    }
 #ifdef VA_START
  VA_START (args, message);
-# if HAVE_VPRINTF || _LIBC
+  error_tail (status, errnum, message, args);
  vfprintf (stderr, message, args);
 # else
  _doprnt (message, args, stderr);
 # endif
  va_end (args);
 #else
  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
 #endif
  ++error_message_count;
  if (errnum)
-    {
+    print_errno_message (errnum);
 #if defined HAVE_STRERROR_R || _LIBC
      char errbuf[1024];
 # if HAVE_WORKING_STRERROR_R || _LIBC
      fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
 # else
      /* Don't use __strerror_r's return value because on some systems
 	 (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'.  */
      __strerror_r (errnum, errbuf, sizeof errbuf);
      fprintf (stderr, ": %s", errbuf);
 # endif
 #else
      fprintf (stderr, ": %s", strerror (errnum));
 #endif
    }
  putc ('\n', stderr);
  fflush (stderr);
  if (status)
    exit (status);
 #endif
 #ifdef _LIBC
 # ifdef USE_IN_LIBIO
  _IO_funlockfile (stderr);
 # else
  __funlockfile (stderr);
 # endif
 #endif
 }
 /* Sometimes we want to have at most one error per line.  This
@@ -212,8 +327,9 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
      static const char *old_file_name;
      static unsigned int old_line_number;
-      if (old_line_number == line_number &&
+      if (old_line_number == line_number
-	  (file_name == old_file_name || !strcmp (old_file_name, file_name)))
+	  && (file_name == old_file_name
 	      || strcmp (old_file_name, file_name) == 0))
 	/* Simply return and print nothing.  */
 	return;
@@ -221,50 +337,58 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
      old_line_number = line_number;
    }
  fflush (stdout);
 #ifdef _LIBC
 # ifdef USE_IN_LIBIO
  _IO_flockfile (stderr);
 # else
  __flockfile (stderr);
 # endif
 #endif
  if (error_print_progname)
    (*error_print_progname) ();
  else
    {
-      fflush (stdout);
+#if _LIBC && USE_IN_LIBIO
-      fprintf (stderr, "%s:", program_name);
+      if (_IO_fwide (stderr, 0) > 0)
 	__fwprintf (stderr, L"%s: ", program_name);
      else
 #endif
 	fprintf (stderr, "%s:", program_name);
    }
  if (file_name != NULL)
-    fprintf (stderr, "%s:%d: ", file_name, line_number);
+    {
 #if _LIBC && USE_IN_LIBIO
      if (_IO_fwide (stderr, 0) > 0)
 	__fwprintf (stderr, L"%s:%d: ", file_name, line_number);
      else
 #endif
 	fprintf (stderr, "%s:%d: ", file_name, line_number);
    }
 #ifdef VA_START
  VA_START (args, message);
-# if HAVE_VPRINTF || _LIBC
+  error_tail (status, errnum, message, args);
  vfprintf (stderr, message, args);
 # else
  _doprnt (message, args, stderr);
 # endif
  va_end (args);
 #else
  fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
 #endif
  ++error_message_count;
  if (errnum)
-    {
+    print_errno_message (errnum);
 #if defined HAVE_STRERROR_R || _LIBC
      char errbuf[1024];
 # if HAVE_WORKING_STRERROR_R || _LIBC
      fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
 # else
      /* Don't use __strerror_r's return value because on some systems
 	 (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'.  */
      __strerror_r (errnum, errbuf, sizeof errbuf);
      fprintf (stderr, ": %s", errbuf);
 # endif
 #else
      fprintf (stderr, ": %s", strerror (errnum));
 #endif
    }
  putc ('\n', stderr);
  fflush (stderr);
  if (status)
    exit (status);
 #endif
 #ifdef _LIBC
 # ifdef USE_IN_LIBIO
  _IO_funlockfile (stderr);
 # else
  __funlockfile (stderr);
 # endif
 #endif
 }
 #ifdef _LIBC
@@ -25,7 +25,7 @@
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
@@ -1,23 +1,25 @@
 /* Getopt for GNU.
-   NOTE: The canonical source of this file is maintained with the GNU
+   NOTE: getopt is now part of the C library, so if you don't know what
-   C Library.  Bugs can be reported to bug-glibc@gnu.org.
+   "Keep this file name-space clean" means, talk to drepper@gnu.org
-
+   before changing it!
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
+   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001
   	Free Software Foundation, Inc.
   This file is part of the GNU C Library.
-   This program is free software; you can redistribute it and/or modify it
+   The GNU C Library is free software; you can redistribute it and/or
-   under the terms of the GNU General Public License as published by the
+   modify it under the terms of the GNU Lesser General Public
-   Free Software Foundation; either version 2, or (at your option) any
+   License as published by the Free Software Foundation; either
-   later version.
+   version 2.1 of the License, or (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
+   The GNU C Library 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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Lesser General Public License for more details.
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Lesser General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with the GNU C Library; if not, write to the Free
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
   02111-1307 USA.  */
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
   Ditto for AIX 3.2 and <stdlib.h>.  */
@@ -27,13 +29,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
-#else
+#endif
-# if !defined __STDC__ || !__STDC__
+
 #if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
   reject `defined (const)'.  */
-#  ifndef const
+# ifndef const
-#   define const
+#  define const
 #  endif
 # endif
 #endif
@@ -75,11 +77,12 @@
 #endif
 #ifndef _
-/* This is for other GNU distributions with internationalized messages.
+/* This is for other GNU distributions with internationalized messages.  */
-   When compiling libc, the _ macro is predefined.  */
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
 # ifdef HAVE_LIBINTL_H
 #  include <libintl.h>
-#  define _(msgid)	gettext (msgid)
+#  ifndef _
 #   define _(msgid)	gettext (msgid)
 #  endif
 # else
 #  define _(msgid)	(msgid)
 # endif
@@ -250,11 +253,13 @@ static int last_nonopt;
 /* Bash 2.0 gives us an environment variable containing flags
   indicating ARGV elements that should not be considered arguments.  */
 #ifdef USE_NONOPTION_FLAGS
 /* Defined in getopt_init.c  */
 extern char *__getopt_nonoption_flags;
 static int nonoption_flags_max_len;
 static int nonoption_flags_len;
 #endif
 static int original_argc;
 static char *const *original_argv;
@@ -275,13 +280,17 @@ store_args_and_env (int argc, char *const *argv)
 text_set_element (__libc_subinit, store_args_and_env);
 # endif /* text_set_element */
-# define SWAP_FLAGS(ch1, ch2) \
+# ifdef USE_NONOPTION_FLAGS
 #  define SWAP_FLAGS(ch1, ch2) \
  if (nonoption_flags_len > 0)						      \
    {									      \
      char __tmp = __getopt_nonoption_flags[ch1];			      \
      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
      __getopt_nonoption_flags[ch2] = __tmp;				      \
    }
 # else
 #  define SWAP_FLAGS(ch1, ch2)
 # endif
 #else	/* !_LIBC */
 # define SWAP_FLAGS(ch1, ch2)
 #endif	/* _LIBC */
@@ -313,7 +322,7 @@ exchange (argv)
     It leaves the longer segment in the right place overall,
     but it consists of two parts that need to be swapped next.  */
-#ifdef _LIBC
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
  /* First make sure the handling of the `__getopt_nonoption_flags'
     string can work normally.  Our top argument must be in the range
     of the string.  */
@@ -417,7 +426,7 @@ _getopt_initialize (argc, argv, optstring)
  else
    ordering = PERMUTE;
-#ifdef _LIBC
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
  if (posixly_correct == NULL
      && argc == original_argc && argv == original_argv)
    {
@@ -515,6 +524,13 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
     int *longind;
     int long_only;
 {
  int print_errors = opterr;
  if (optstring[0] == ':')
    print_errors = 0;
  if (argc < 1)
    return -1;
  optarg = NULL;
  if (optind == 0 || !__getopt_initialized)
@@ -529,7 +545,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
     Either it does not have option syntax, or there is an environment flag
     from the shell indicating it is not an option.  The later information
     is only used when the used in the GNU libc.  */
-#ifdef _LIBC
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
 # define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
 		      || (optind < nonoption_flags_len			      \
 			  && __getopt_nonoption_flags[optind] == '1'))
@@ -664,14 +680,17 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		pfound = p;
 		indfound = option_index;
 	      }
-	    else
+	    else if (long_only
 		     || pfound->has_arg != p->has_arg
 		     || pfound->flag != p->flag
 		     || pfound->val != p->val)
 	      /* Second or later nonexact match found.  */
 	      ambig = 1;
 	  }
      if (ambig && !exact)
 	{
-	  if (opterr)
+	  if (print_errors)
 	    fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
 		     argv[0], argv[optind]);
 	  nextchar += strlen (nextchar);
@@ -692,7 +711,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		optarg = nameend + 1;
 	      else
 		{
-		  if (opterr)
+		  if (print_errors)
 		    {
 		      if (argv[optind - 1][1] == '-')
 			/* --option */
@@ -718,7 +737,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		optarg = argv[optind++];
 	      else
 		{
-		  if (opterr)
+		  if (print_errors)
 		    fprintf (stderr,
 			   _("%s: option `%s' requires an argument\n"),
 			   argv[0], argv[optind - 1]);
@@ -745,7 +764,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
      if (!long_only || argv[optind][1] == '-'
 	  || my_index (optstring, *nextchar) == NULL)
 	{
-	  if (opterr)
+	  if (print_errors)
 	    {
 	      if (argv[optind][1] == '-')
 		/* --option */
@@ -775,7 +794,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
    if (temp == NULL || c == ':')
      {
-	if (opterr)
+	if (print_errors)
 	  {
 	    if (posixly_correct)
 	      /* 1003.2 specifies the format of this message.  */
@@ -809,7 +828,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	  }
 	else if (optind == argc)
 	  {
-	    if (opterr)
+	    if (print_errors)
 	      {
 		/* 1003.2 specifies the format of this message.  */
 		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
@@ -858,7 +877,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	    }
 	if (ambig && !exact)
 	  {
-	    if (opterr)
+	    if (print_errors)
 	      fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
 		       argv[0], argv[optind]);
 	    nextchar += strlen (nextchar);
@@ -876,7 +895,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		  optarg = nameend + 1;
 		else
 		  {
-		    if (opterr)
+		    if (print_errors)
 		      fprintf (stderr, _("\
 %s: option `-W %s' doesn't allow an argument\n"),
 			       argv[0], pfound->name);
@@ -891,7 +910,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		  optarg = argv[optind++];
 		else
 		  {
-		    if (opterr)
+		    if (print_errors)
 		      fprintf (stderr,
 			       _("%s: option `%s' requires an argument\n"),
 			       argv[0], argv[optind - 1]);
@@ -938,12 +957,12 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	      }
 	    else if (optind == argc)
 	      {
-		if (opterr)
+		if (print_errors)
 		  {
 		    /* 1003.2 specifies the format of this message.  */
 		    fprintf (stderr,
-			   _("%s: option requires an argument -- %c\n"),
+			     _("%s: option requires an argument -- %c\n"),
-			   argv[0], c);
+			     argv[0], c);
 		  }
 		optopt = c;
 		if (optstring[0] == ':')
@@ -1,21 +1,21 @@
 /* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
+   Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc.
-   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   This file is part of the GNU C Library.
   Bugs can be reported to [email protected].
   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 distributed in the hope that it will be useful,
+   The GNU C Library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
   version 2.1 of the License, or (at your option) any later version.
   The GNU C Library 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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Lesser General Public License for more details.
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Lesser General Public
-   along with this program; if not, write to the Free Software
+   License along with the GNU C Library; if not, write to the Free
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   USA.  */
+   02111-1307 USA.  */
 #ifndef _GETOPT_H
@@ -23,6 +23,17 @@
 # define _GETOPT_H 1
 #endif
 /* If __GNU_LIBRARY__ is not already defined, either we are being used
   standalone, or this is the first header included in the source file.
   If we are being used with glibc, we need to include <features.h>, but
   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
   not defined, include <ctype.h>, which will pull in <features.h> for us
   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
   doesn't flood the namespace with stuff the way some other headers do.)  */
 #if !defined __GNU_LIBRARY__
 # include <ctype.h>
 #endif
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -82,7 +93,7 @@ extern int optopt;
 struct option
 {
-# if defined __STDC__ && __STDC__
+# if (defined __STDC__ && __STDC__) || defined __cplusplus
  const char *name;
 # else
  char *name;
@@ -126,7 +137,7 @@ struct option
   arguments to the option '\0'.  This behavior is specific to the GNU
   `getopt'.  */
-#if defined __STDC__ && __STDC__
+#if (defined __STDC__ && __STDC__) || defined __cplusplus
 # ifdef __GNU_LIBRARY__
 /* Many other libraries have conflicting prototypes for getopt, with
   differences in the consts, in stdlib.h.  To avoid compilation
@@ -1,26 +1,29 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
     Free Software Foundation, Inc.
-   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   This file is part of the GNU C Library.
   Bugs can be reported to [email protected].
-   This program is free software; you can redistribute it and/or modify it
+   The GNU C Library is free software; you can redistribute it and/or
-   under the terms of the GNU General Public License as published by the
+   modify it under the terms of the GNU Lesser General Public
-   Free Software Foundation; either version 2, or (at your option) any
+   License as published by the Free Software Foundation; either
-   later version.
+   version 2.1 of the License, or (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
+   The GNU C Library 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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Lesser General Public License for more details.
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Lesser General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with the GNU C Library; if not, write to the Free
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
   02111-1307 USA.  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#else
+#endif
 #include "getopt.h"
 #if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
   reject `defined (const)'.  */
@@ -28,9 +31,6 @@
 #define const
 #endif
 #endif
 #endif
 #include "getopt.h"
 #include <stdio.h>
@@ -1,26 +1,25 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988-1994,96,97,98,99,2000 Free Software Foundation, Inc.
+   Copyright (C) 1988-1994,96,97,98,99,2000,2001 Free Software Foundation, Inc.
   This file is part of the GNU C Library.  Its master source is NOT part of
   the C library, however.  The master source lives in /gd/gnu/lib.
   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
+   modify it under the terms of the GNU Lesser General Public
-   published by the Free Software Foundation; either version 2 of the
+   License as published by the Free Software Foundation; either
-   License, or (at your option) any later version.
+   version 2.1 of the License, or (at your option) any later version.
   The GNU C Library 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.
+   Lesser General Public License for more details.
-   You should have received a copy of the GNU Library General Public
+   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   License along with the GNU C Library; if not, write to the Free
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   Boston, MA 02111-1307, USA.  */
+   02111-1307 USA.  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 #include "obstack.h"
@@ -40,40 +39,43 @@
   files, it is simpler to just do this in the source for each such file.  */
 #include <stdio.h>		/* Random thing to get __GNU_LIBRARY__.  */
-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
+#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
-#include <gnu-versions.h>
+# include <gnu-versions.h>
-#if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
+# if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
-#define ELIDE_CODE
+#  define ELIDE_CODE
-#endif
+# endif
 #endif
 #if defined _LIBC && defined USE_IN_LIBIO
 # include <wchar.h>
 #endif
 #ifndef ELIDE_CODE
-#if defined (__STDC__) && __STDC__
+# if defined __STDC__ && __STDC__
-#define POINTER void *
+#  define POINTER void *
-#else
+# else
-#define POINTER char *
+#  define POINTER char *
-#endif
+# endif
 /* Determine default alignment.  */
 struct fooalign {char x; double d;};
-#define DEFAULT_ALIGNMENT  \
+# define DEFAULT_ALIGNMENT  \
  ((PTR_INT_TYPE) ((char *) &((struct fooalign *) 0)->d - (char *) 0))
 /* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT.
   But in fact it might be less smart and round addresses to as much as
   DEFAULT_ROUNDING.  So we prepare for it to do that.  */
 union fooround {long x; double d;};
-#define DEFAULT_ROUNDING (sizeof (union fooround))
+# define DEFAULT_ROUNDING (sizeof (union fooround))
 /* When we copy a long block of data, this is the unit to do it with.
   On some machines, copying successive ints does not work;
   in such a case, redefine COPYING_UNIT to `long' (if that works)
   or `char' as a last resort.  */
-#ifndef COPYING_UNIT
+# ifndef COPYING_UNIT
-#define COPYING_UNIT int
+#  define COPYING_UNIT int
-#endif
+# endif
 /* The functions allocating more room by calling `obstack_chunk_alloc'
@@ -82,21 +84,21 @@ union fooround {long x; double d;};
   abort gracefully or use longjump - but shouldn't return.  This
   variable by default points to the internal function
   `print_and_abort'.  */
-#if defined (__STDC__) && __STDC__
+# if defined __STDC__ && __STDC__
 static void print_and_abort (void);
 void (*obstack_alloc_failed_handler) (void) = print_and_abort;
-#else
+# else
 static void print_and_abort ();
 void (*obstack_alloc_failed_handler) () = print_and_abort;
-#endif
+# endif
 /* Exit value used when `print_and_abort' is used.  */
-#if defined __GNU_LIBRARY__ || defined HAVE_STDLIB_H
+# if defined __GNU_LIBRARY__ || defined HAVE_STDLIB_H
-#include <stdlib.h>
+#  include <stdlib.h>
-#endif
+# endif
-#ifndef EXIT_FAILURE
+# ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
+#  define EXIT_FAILURE 1
-#endif
+# endif
 int obstack_exit_failure = EXIT_FAILURE;
 /* The non-GNU-C macros copy the obstack into this global variable
@@ -110,33 +112,33 @@ struct obstack *_obstack;
   For free, do not use ?:, since some compilers, like the MIPS compilers,
   do not allow (expr) ? void : void.  */
-#if defined (__STDC__) && __STDC__
+# if defined __STDC__ && __STDC__
-#define CALL_CHUNKFUN(h, size) \
+#  define CALL_CHUNKFUN(h, size) \
  (((h) -> use_extra_arg) \
   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
   : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))
-#define CALL_FREEFUN(h, old_chunk) \
+#  define CALL_FREEFUN(h, old_chunk) \
  do { \
    if ((h) -> use_extra_arg) \
      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
    else \
      (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
  } while (0)
-#else
+# else
-#define CALL_CHUNKFUN(h, size) \
+#  define CALL_CHUNKFUN(h, size) \
  (((h) -> use_extra_arg) \
   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
   : (*(struct _obstack_chunk *(*) ()) (h)->chunkfun) ((size)))
-#define CALL_FREEFUN(h, old_chunk) \
+#  define CALL_FREEFUN(h, old_chunk) \
  do { \
    if ((h) -> use_extra_arg) \
      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
    else \
      (*(void (*) ()) (h)->freefun) ((old_chunk)); \
  } while (0)
-#endif
+# endif
 /* Initialize an obstack H for use.  Specify chunk size SIZE (0 means default).
@@ -152,13 +154,13 @@ _obstack_begin (h, size, alignment, chunkfun, freefun)
     struct obstack *h;
     int size;
     int alignment;
-#if defined (__STDC__) && __STDC__
+# if defined __STDC__ && __STDC__
     POINTER (*chunkfun) (long);
     void (*freefun) (void *);
-#else
+# else
     POINTER (*chunkfun) ();
     void (*freefun) ();
-#endif
+# endif
 {
  register struct _obstack_chunk *chunk; /* points to new chunk */
@@ -181,13 +183,13 @@ _obstack_begin (h, size, alignment, chunkfun, freefun)
      size = 4096 - extra;
    }
-#if defined (__STDC__) && __STDC__
+# if defined __STDC__ && __STDC__
  h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
  h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
-#else
+# else
  h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun;
  h->freefun = freefun;
-#endif
+# endif
  h->chunk_size = size;
  h->alignment_mask = alignment - 1;
  h->use_extra_arg = 0;
@@ -210,13 +212,13 @@ _obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)
     struct obstack *h;
     int size;
     int alignment;
-#if defined (__STDC__) && __STDC__
+# if defined __STDC__ && __STDC__
     POINTER (*chunkfun) (POINTER, long);
     void (*freefun) (POINTER, POINTER);
-#else
+# else
     POINTER (*chunkfun) ();
     void (*freefun) ();
-#endif
+# endif
     POINTER arg;
 {
  register struct _obstack_chunk *chunk; /* points to new chunk */
@@ -240,13 +242,13 @@ _obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)
      size = 4096 - extra;
    }
-#if defined(__STDC__) && __STDC__
+# if defined __STDC__ && __STDC__
  h->chunkfun = (struct _obstack_chunk * (*)(void *,long)) chunkfun;
  h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
-#else
+# else
  h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun;
  h->freefun = freefun;
-#endif
+# endif
  h->chunk_size = size;
  h->alignment_mask = alignment - 1;
  h->extra_arg = arg;
@@ -341,11 +343,11 @@ _obstack_newchunk (h, length)
   This is here for debugging.
   If you use it in a program, you are probably losing.  */
-#if defined (__STDC__) && __STDC__
+# if defined __STDC__ && __STDC__
 /* Suppress -Wmissing-prototypes warning.  We don't want to declare this in
   obstack.h because it is just for debugging.  */
 int _obstack_allocated_p (struct obstack *h, POINTER obj);
-#endif
+# endif
 int
 _obstack_allocated_p (h, obj)
@@ -370,7 +372,7 @@ _obstack_allocated_p (h, obj)
 /* Free objects in obstack H, including OBJ and everything allocate
   more recently than OBJ.  If OBJ is zero, free everything in H.  */
-#undef obstack_free
+# undef obstack_free
 /* This function has two names with identical definitions.
   This is the first one, called from non-ANSI code.  */
@@ -456,37 +458,54 @@ _obstack_memory_used (h)
 }
 /* Define the error handler.  */
-#ifndef _
+# ifndef _
-# if defined HAVE_LIBINTL_H || defined _LIBC
+#  if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
-#  include <libintl.h>
+#   include <libintl.h>
-#  ifndef _
+#   ifndef _
-#   define _(Str) gettext (Str)
+#    define _(Str) gettext (Str)
 #   endif
 #  else
 #   define _(Str) (Str)
 #  endif
 # endif
 # if defined _LIBC && defined USE_IN_LIBIO
 #  include <libio/iolibio.h>
 #  define fputs(s, f) _IO_fputs (s, f)
 # endif
 # ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 #  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
 #   define __attribute__(Spec) /* empty */
 #  endif
 # else
 #  define _(Str) (Str)
 # endif
 #endif
 #if defined _LIBC && defined USE_IN_LIBIO
 # include <libio/iolibio.h>
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 static void
 __attribute__ ((noreturn))
 print_and_abort ()
 {
-  fputs (_("memory exhausted"), stderr);
+  /* Don't change any of these strings.  Yes, it would be possible to add
-  fputc ('\n', stderr);
+     the newline to the string and use fputs or so.  But this must not
     happen because the "memory exhausted" message appears in other places
     like this and the translation should be reused instead of creating
     a very similar string which requires a separate translation.  */
 # if defined _LIBC && defined USE_IN_LIBIO
  if (_IO_fwide (stderr, 0) > 0)
    __fwprintf (stderr, L"%s\n", _("memory exhausted"));
  else
 # endif
    fprintf (stderr, "%s\n", _("memory exhausted"));
  exit (obstack_exit_failure);
 }
-#if 0
+# if 0
 /* These are now turned off because the applications do not use it
   and it uses bcopy via obstack_grow, which causes trouble on sysV.  */
 /* Now define the functional versions of the obstack macros.
   Define them to simply use the corresponding macros to do the job.  */
-#if defined (__STDC__) && __STDC__
+#  if defined __STDC__ && __STDC__
 /* These function definitions do not work with non-ANSI preprocessors;
   they won't pass through the macro names in parentheses.  */
@@ -597,8 +616,8 @@ POINTER (obstack_copy0) (obstack, address, length)
  return obstack_copy0 (obstack, address, length);
 }
-#endif /* __STDC__ */
+#  endif /* __STDC__ */
-#endif /* 0 */
+# endif /* 0 */
 #endif	/* !ELIDE_CODE */
@@ -4,20 +4,23 @@
   This file is part of the GNU C Library.  Its master source is NOT part of
   the C library, however.  The master source lives in /gd/gnu/lib.
-   The GNU C Library is free software; you can redistribute it and/or
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
-   modify it under the terms of the GNU Library General Public License as
+   Bugs can be reported to [email protected].
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
-   The GNU C Library is distributed in the hope that it will be useful,
+   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 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 Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   License along with this program; if not, write to the Free Software
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   Boston, MA 02111-1307, USA.  */
+   USA.  */
 /* Summary:
@@ -4,6 +4,9 @@
 # include <config.h>
 #endif
 #if HAVE_STDDEF_H
 # include <stddef.h>  /* For the definition of size_t on windows w/MSVC.  */
 #endif
 #include <sys/types.h>
 #include <quotearg.h>
 #include <quote.h>
@@ -1,5 +1,5 @@
 /* Find the length of STRING, but scan at most MAXLEN characters.
-   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
   This file is part of the GNU C Library.
   The GNU C Library is free software; you can redistribute it and/or
@@ -51,7 +51,7 @@ size_t
 __strnlen (const char *string, size_t maxlen)
 {
  const char *end = memchr (string, '\0', maxlen);
-  return end ? end - string : maxlen;
+  return end ? (size_t) (end - string) : maxlen;
 }
 #ifdef weak_alias
 weak_alias (__strnlen, strnlen)
@@ -47,11 +47,11 @@ void free ();
 #endif
 #ifndef HAVE_DONE_WORKING_MALLOC_CHECK
-you must run the autoconf test for a properly working malloc -- see malloc.m4
+"you must run the autoconf test for a properly working malloc -- see malloc.m4"
 #endif
 #ifndef HAVE_DONE_WORKING_REALLOC_CHECK
-you must run the autoconf test for a properly working realloc -- see realloc.m4
+"you must run the autoconf test for a properly working realloc --see realloc.m4"
 #endif
 /* Exit value when the requested amount of memory is not available.
@@ -9,7 +9,6 @@ glibc21.m4					\
 iconv.m4					\
 isc-posix.m4					\
 lcmessage.m4					\
 m4.m4						\
 malloc.m4					\
 mbrtowc.m4					\
 mbstate_t.m4					\
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
 # @configure_input@
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +44,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,7 +59,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -66,7 +73,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -79,10 +86,8 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -106,7 +111,6 @@ glibc21.m4					\
 iconv.m4					\
 isc-posix.m4					\
 lcmessage.m4					\
 m4.m4						\
 malloc.m4					\
 mbrtowc.m4					\
 mbstate_t.m4					\
@@ -129,9 +133,7 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  m4/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 uninstall-info-am:
 tags: TAGS
 TAGS:
@@ -1,8 +1,8 @@
-#serial 3
+#serial 4
 dnl From Paul Eggert.
-AC_DEFUN(AC_C_BACKSLASH_A,
+AC_DEFUN([AC_C_BACKSLASH_A],
 [
  AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a,
   [AC_TRY_COMPILE([],
@@ -1,12 +1,13 @@
-#serial 1
+#serial 4
 dnl FIXME: put these prerequisite-only *.m4 files in a separate
 dnl directory -- otherwise, they'll conflict with existing files.
 dnl These are the prerequisite macros for GNU's error.c file.
-AC_DEFUN(jm_PREREQ_ERROR,
+AC_DEFUN([jm_PREREQ_ERROR],
 [
-  AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
+  AC_CHECK_FUNCS(strerror vprintf doprnt)
-  AC_HEADER_STDC
+  AC_CHECK_DECLS([strerror])
  AC_FUNC_STRERROR_R
  AC_HEADER_STDC
 ])
@@ -3,10 +3,12 @@
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
+# License or the GNU Library General Public License but which still want
-# functionality.
+# to provide support for the GNU gettext functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
+# Please note that the actual code of the GNU gettext library is covered
-# General Public License and is *not* in the public domain.
+# by the GNU Library General Public License, and the rest of the GNU
 # gettext package package is covered by the GNU General Public License.
 # They are *not* in the public domain.
 # serial 10
@@ -241,7 +243,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", ""
      dnl Found it, now check the version.
      AC_MSG_CHECKING([version of bison])
 changequote(<<,>>)dnl
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
      case $ac_prog_version in
        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
@@ -3,10 +3,12 @@
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
+# License or the GNU Library General Public License but which still want
-# functionality.
+# to provide support for the GNU gettext functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
+# Please note that the actual code of the GNU gettext library is covered
-# General Public License and is *not* in the public domain.
+# by the GNU Library General Public License, and the rest of the GNU
 # gettext package package is covered by the GNU General Public License.
 # They are *not* in the public domain.
 # serial 2
@@ -1,16 +0,0 @@
 # serial 1                                                   -*- Autoconf -*-
 # BISON_AC_PROG_GNU_M4
 # --------------------
 # Check for GNU m4, at least 1.3 (supports frozen files).
 AC_DEFUN([BISON_AC_PROG_GNU_M4],
 [AC_PATH_PROGS(M4, gm4 gnum4 m4, m4)
 AC_CACHE_CHECK([whether m4 supports frozen files],
               [ac_cv_prog_gnu_m4],
 [ac_cv_prog_gnu_m4=no
 if test x"$M4" != x; then
  case `$M4 --help < /dev/null 2>&1` in
    *reload-state*) ac_cv_prog_gnu_m4=yes ;;
  esac
 fi])
 ])# BISON_AC_PROG_GNU_M4
@@ -1,16 +1,16 @@
-#serial 3
+#serial 5
 dnl From Jim Meyering.
 dnl Determine whether malloc accepts 0 as its argument.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
-AC_DEFUN(jm_FUNC_MALLOC,
+AC_DEFUN([jm_FUNC_MALLOC],
 [
 dnl xmalloc.c requires that this symbol be defined so it doesn't
 dnl mistakenly use a broken malloc -- as it might if this test were omitted.
- AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
+ AC_DEFINE(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
-                    [Define if the malloc check has been performed. ])
+           [Define if the malloc check has been performed. ])
 AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
  [AC_TRY_RUN([
@@ -27,9 +27,8 @@ AC_DEFUN(jm_FUNC_MALLOC,
 	 jm_cv_func_working_malloc=no)
  ])
  if test $jm_cv_func_working_malloc = no; then
-    AC_SUBST(LIBOBJS)
+    AC_LIBOBJ(malloc)
-    LIBOBJS="$LIBOBJS malloc.$ac_objext"
+    AC_DEFINE(malloc, rpl_malloc,
    AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
      [Define to rpl_malloc if the replacement function should be used.])
  fi
 ])
@@ -1,4 +1,4 @@
-# serial 8
+# serial 9
 # From Paul Eggert.
@@ -10,7 +10,7 @@
 # (at least glibc-2.1.3) because the "_XOPEN_SOURCE 500" definition elicits
 # a syntax error in wchar.h due to the use of undefined __int32_t.
-AC_DEFUN(AC_MBSTATE_T,
+AC_DEFUN([AC_MBSTATE_T],
  [
   AC_CHECK_HEADERS(stdlib.h)
@@ -3,10 +3,12 @@
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
+# License or the GNU Library General Public License but which still want
-# functionality.
+# to provide support for the GNU gettext functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
+# Please note that the actual code of the GNU gettext library is covered
-# General Public License and is *not* in the public domain.
+# by the GNU Library General Public License, and the rest of the GNU
 # gettext package package is covered by the GNU General Public License.
 # They are *not* in the public domain.
 # serial 2
@@ -1,16 +1,16 @@
-#serial 3
+#serial 5
 dnl From Jim Meyering.
 dnl Determine whether realloc works when both arguments are 0.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
-AC_DEFUN(jm_FUNC_REALLOC,
+AC_DEFUN([jm_FUNC_REALLOC],
 [
 dnl xmalloc.c requires that this symbol be defined so it doesn't
 dnl mistakenly use a broken realloc -- as it might if this test were omitted.
- AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
+ AC_DEFINE(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
-                    [Define if the realloc check has been performed. ])
+           [Define if the realloc check has been performed. ])
 AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
  [AC_TRY_RUN([
@@ -27,9 +27,8 @@ AC_DEFUN(jm_FUNC_REALLOC,
 	 jm_cv_func_working_realloc=no)
  ])
  if test $jm_cv_func_working_realloc = no; then
-    AC_SUBST(LIBOBJS)
+    AC_LIBOBJ(realloc)
-    LIBOBJS="$LIBOBJS realloc.$ac_objext"
+    AC_DEFINE(realloc, rpl_realloc,
    AC_DEFINE_UNQUOTED(realloc, rpl_realloc,
      [Define to rpl_realloc if the replacement function should be used.])
  fi
 ])
@@ -1,9 +1,23 @@
-#serial 1002
+#serial 1003
 # Experimental replacement for the function in the latest CVS autoconf.
 # If the compile-test says strerror_r doesn't work, then resort to a
 # `run'-test that works on BeOS and segfaults on DEC Unix.
 # Use with the error.c file in ../lib.
 # Copyright 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)
 # 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.
 # 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.  */
 undefine([AC_FUNC_STRERROR_R])
 # AC_FUNC_STRERROR_R
@@ -11,56 +25,35 @@ undefine([AC_FUNC_STRERROR_R])
 AC_DEFUN([AC_FUNC_STRERROR_R],
 [AC_CHECK_DECLS([strerror_r])
 AC_CHECK_FUNCS([strerror_r])
-if test $ac_cv_func_strerror_r = yes; then
+AC_CACHE_CHECK([whether strerror_r returns char *],
-  AC_CHECK_HEADERS(string.h)
+               ac_cv_func_strerror_r_char_p,
  AC_CACHE_CHECK([for working strerror_r],
                 ac_cv_func_strerror_r_works,
   [
-    AC_TRY_COMPILE(
+    ac_cv_func_strerror_r_char_p=no
-     [
+    if test $ac_cv_have_decl_strerror_r = yes; then
-#       include <stdio.h>
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
-#       if HAVE_STRING_H
+	[[
-#        include <string.h>
+	  char buf[100];
-#       endif
+	  char x = *strerror_r (0, buf, sizeof buf);
-     ],
+	  char *p = strerror_r (0, buf, sizeof buf);
-     [
+	]])],
-       char buf[100];
+			ac_cv_func_strerror_r_char_p=yes)
-       char x = *strerror_r (0, buf, sizeof buf);
+    else
-     ],
+      # strerror_r is not declared.  Choose between
     ac_cv_func_strerror_r_works=yes,
     ac_cv_func_strerror_r_works=no
    )
    if test $ac_cv_func_strerror_r_works = no; then
      # strerror_r seems not to work, but now we have to choose between
      # systems that have relatively inaccessible declarations for the
      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
      # former has a strerror_r that returns char*, while the latter
      # has a strerror_r that returns `int'.
      # This test should segfault on the DEC system.
-      AC_TRY_RUN(
+      AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
-       [
+	extern char *strerror_r ();],
-#       include <stdio.h>
+	[[char buf[100];
 #       include <string.h>
 #       include <ctype.h>
 	extern char *strerror_r ();
 	int
 	main ()
 	{
 	  char buf[100];
 	  char x = *strerror_r (0, buf, sizeof buf);
-	  exit (!isalpha (x));
+	  exit (!isalpha (x));]])],
-	}
+                    ac_cv_func_strerror_r_char_p=yes, , :)
       ],
       ac_cv_func_strerror_r_works=yes,
       ac_cv_func_strerror_r_works=no,
       ac_cv_func_strerror_r_works=no)
    fi
  ])
-  if test $ac_cv_func_strerror_r_works = yes; then
+if test $ac_cv_func_strerror_r_char_p = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_WORKING_STRERROR_R, 1,
+  AC_DEFINE([STRERROR_R_CHAR_P], 1,
-      [Define to 1 if `strerror_r' returns a string.])
+	    [Define to 1 if strerror_r returns char *.])
  fi
 fi
 ])# AC_FUNC_STRERROR_R
@@ -1,3 +1,16 @@
 2001-10-10  gettextize  <[email protected]>
 	* Makefile.in.in: Upgrade to gettext-0.10.40.
 2001-10-10  gettextize  <[email protected]>
 	* Makefile.in.in: Upgrade to gettext-0.10.40.
 2001-10-09  gettextize  <[email protected]>
 	* Makefile.in.in: Upgrade to gettext-0.10.40.
 	* cat-id-tbl.c: Remove file.
 2001-09-27  gettextize  <[email protected]>
 	* Makefile.in.in: Upgrade to gettext-0.10.40.
@@ -1,188 +0,0 @@
 /* Automatically generated by po2tbl.sed from bison.pot.  */
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 #include "libgettext.h"
 const struct _msg_ent _msg_tbl[] = {
  {"", 1},
  {"too many states (max %d)", 2},
  {"Conflict in state %d between rule %d and token %s resolved as %s.\n", 3},
  {"reduce", 4},
  {"shift", 5},
  {"an error", 6},
  {" 1 shift/reduce conflict", 7},
  {" %d shift/reduce conflicts", 8},
  {" and", 9},
  {" 1 reduce/reduce conflict", 10},
  {" %d reduce/reduce conflicts", 11},
  {"State %d contains", 12},
  {"conflicts: ", 13},
  {" %d shift/reduce", 14},
  {" %d reduce/reduce", 15},
  {"%s contains", 16},
  {"    %-4s\t[reduce using rule %d (%s)]\n", 17},
  {"\
    $default\treduce using rule %d (%s)\n\
 \n", 18},
  {"    %-4s\treduce using rule %d (%s)\n", 19},
  {"    $default\treduce using rule %d (%s)\n", 20},
  {"DERIVES", 21},
  {"%s derives", 22},
  {"GNU bison generates parsers for LALR(1) grammars.\n", 23},
  {"Usage: %s [OPTION]... FILE\n", 24},
  {"\
 If a long option shows an argument as mandatory, then it is mandatory\n\
 for the equivalent short option also.  Similarly for optional arguments.\n", 25},
  {"\
 Operation modes:\n\
  -h, --help      display this help and exit\n\
  -V, --version   output version information and exit\n\
  -y, --yacc      emulate POSIX yacc\n", 26},
  {"\
 Parser:\n\
  -S, --skeleton=FILE        specify the skeleton to use\n\
  -t, --debug                instrument the parser for debugging\n\
      --locations            enable locations computation\n\
  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n\
  -l, --no-lines             don't generate `#line' directives\n\
  -n, --no-parser            generate the tables only\n\
  -r, --raw                  number the tokens from 3\n\
  -k, --token-table          include a table of token names\n", 27},
  {"\
 Output:\n\
  -d, --defines              also produce a header file\n\
  -v, --verbose              also produce an explanation of the automaton\n\
  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
  -o, --output-file=FILE     leave output to FILE\n", 28},
  {"Report bugs to <[email protected]>.\n", 29},
  {"bison (GNU Bison) %s", 30},
  {"\
 Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n", 31},
  {"\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 32},
  {"Try `%s --help' for more information.\n", 33},
  {"%s: no grammar file given\n", 34},
  {"%s: extra arguments ignored after `%s'\n", 35},
  {"too many gotos (max %d)", 36},
  {"unexpected `/' found and ignored", 37},
  {"unterminated comment", 38},
  {"unexpected end of file", 39},
  {"unescaped newline in constant", 40},
  {"octal value outside range 0...255: `\\%o'", 41},
  {"hexadecimal value above 255: `\\x%x'", 42},
  {"unknown escape sequence: `\\' followed by `%s'", 43},
  {"unterminated type name at end of file", 44},
  {"unterminated type name", 45},
  {"use \"...\" for multi-character literal tokens", 46},
  {"%s: internal error: %s\n", 47},
  {"Entering set_nullable", 48},
  {"maximum table size (%d) exceeded", 49},
  {" type %d is %s\n", 50},
  {"   (rule %d)", 51},
  {"    $default\taccept\n", 52},
  {"    NO ACTIONS\n", 53},
  {"    $   \tgo to state %d\n", 54},
  {"    %-4s\tshift, and go to state %d\n", 55},
  {"    %-4s\terror (nonassociative)\n", 56},
  {"    %-4s\tgo to state %d\n", 57},
  {"state %d", 58},
  {"Grammar", 59},
  {"rule %-4d %s ->", 60},
  {"\t\t/* empty */", 61},
  {"Terminals, with rules where they appear", 62},
  {"Nonterminals, with rules where they appear", 63},
  {" on left:", 64},
  {" on right:", 65},
  {"   Skipping to next \\n", 66},
  {"   Skipping to next %c", 67},
  {"invalid $ value", 68},
  {"unterminated string at end of file", 69},
  {"unterminated string", 70},
  {"%s is invalid", 71},
  {"$$ of `%s' has no declared type", 72},
  {"$%d of `%s' has no declared type", 73},
  {"unterminated `%{' definition", 74},
  {"Premature EOF after %s", 75},
  {"symbol `%s' used more than once as a literal string", 76},
  {"symbol `%s' given more than one literal string", 77},
  {"symbol %s redefined", 78},
  {"type redeclaration for %s", 79},
  {"`%s' is invalid in %s", 80},
  {"multiple %s declarations", 81},
  {"invalid %s declaration", 82},
  {"%type declaration has no <typename>", 83},
  {"invalid %%type declaration due to item: %s", 84},
  {"redefining precedence of %s", 85},
  {"invalid text (%s) - number should be after identifier", 86},
  {"unexpected item: %s", 87},
  {"unmatched %s", 88},
  {"argument of %%expect is not an integer", 89},
  {"unrecognized item %s, expected an identifier", 90},
  {"expected string constant instead of %s", 91},
  {"unrecognized: %s", 92},
  {"no input grammar", 93},
  {"unknown character: %s", 94},
  {"unterminated %guard clause", 95},
  {"ill-formed rule: initial symbol not followed by colon", 96},
  {"grammar starts with vertical bar", 97},
  {"rule given for %s, which is a token", 98},
  {"two @prec's in a row", 99},
  {"%%guard present but %%semantic_parser not specified", 100},
  {"two actions at end of one rule", 101},
  {"type clash (`%s' `%s') on default action", 102},
  {"empty rule for typed nonterminal, and no action", 103},
  {"invalid input: %s", 104},
  {"too many symbols (tokens plus nonterminals); maximum %d", 105},
  {"no rules in the input grammar", 106},
  {"symbol %s is used, but is not defined as a token and has no rules", 107},
  {"conflicting precedences for %s and %s", 108},
  {"conflicting assoc values for %s and %s", 109},
  {"tokens %s and %s both assigned number %d", 110},
  {"the start symbol %s is undefined", 111},
  {"the start symbol %s is a token", 112},
  {"Useless nonterminals:", 113},
  {"Terminals which are not used:", 114},
  {"Useless rules:", 115},
  {"\
 Variables\n\
 ---------\n\
 \n", 116},
  {"Value  Sprec    Sassoc    Tag\n", 117},
  {"\
 Rules\n\
 -----\n\
 \n", 118},
  {"\
 Rules interpreted\n\
 -----------------\n\
 \n", 119},
  {"%d rules never reduced\n", 120},
  {"%s contains ", 121},
  {"%d useless nonterminal%s", 122},
  {" and ", 123},
  {"%d useless rule%s", 124},
  {"Start symbol %s does not derive any sentence", 125},
  {"\
 reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n", 126},
  {"Unknown system error", 127},
  {"%s: option `%s' is ambiguous\n", 128},
  {"%s: option `--%s' doesn't allow an argument\n", 129},
  {"%s: option `%c%s' doesn't allow an argument\n", 130},
  {"%s: option `%s' requires an argument\n", 131},
  {"%s: unrecognized option `--%s'\n", 132},
  {"%s: unrecognized option `%c%s'\n", 133},
  {"%s: illegal option -- %c\n", 134},
  {"%s: invalid option -- %c\n", 135},
  {"%s: option requires an argument -- %c\n", 136},
  {"%s: option `-W %s' is ambiguous\n", 137},
  {"%s: option `-W %s' doesn't allow an argument\n", 138},
  {"memory exhausted", 139},
  {"`", 140},
  {"'", 141},
 };
 int _msg_tbl_length = 141;
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-10-02 18:30+0200\n"
+"POT-Creation-Date: 2001-10-26 14:37+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"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr ""
-#: lib/error.c:117 src/complain.c:96
+#: lib/error.c:128 lib/error.c:156 src/complain.c:96
 msgid "Unknown system error"
 msgstr ""
@@ -714,68 +714,68 @@ msgstr ""
 "Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d "
 "Produktionen.\n"
-#: lib/getopt.c:675
+#: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: die Option »%s« ist nicht eindeutig\n"
-#: lib/getopt.c:700
+#: lib/getopt.c:719
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: die Option »--%s« erlaubt kein Argument\n"
-#: lib/getopt.c:705
+#: lib/getopt.c:724
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: die Option »%c%s« erlaubt kein Argument\n"
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:742 lib/getopt.c:915
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: die Option »%s« erfordert ein Argument\n"
 #. --option
-#: lib/getopt.c:752
+#: lib/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option »--%s«\n"
 #. +option or -option
-#: lib/getopt.c:756
+#: lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option »%c%s«\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
+#: lib/getopt.c:801
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: die Option ist nicht erlaubt -- %c\n"
-#: lib/getopt.c:785
+#: lib/getopt.c:804
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:834 lib/getopt.c:964
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: die Option benötigt ein Argument -- %c\n"
-#: lib/getopt.c:862
+#: lib/getopt.c:881
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: die Option »%s« ist nicht eindeutig\n"
-#: lib/getopt.c:880
+#: lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: die Option »--%s« erlaubt kein Argument\n"
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
-#: lib/obstack.c:477 lib/xmalloc.c:66
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
 #, fuzzy
 msgid "memory exhausted"
 msgstr "%s: Hauptspeicher erschöpft\n"
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 2001-10-02 18:30+0200\n"
+"POT-Creation-Date: 2001-10-26 14:37+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"
@@ -43,7 +43,7 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr ""
-#: lib/error.c:117 src/complain.c:96
+#: lib/error.c:128 lib/error.c:156 src/complain.c:96
 msgid "Unknown system error"
 msgstr ""
@@ -820,35 +820,35 @@ msgstr ""
 "la reducción de %s define %d terminal%s, %d no terminal%s, y %d produccion%"
 "s.\n"
-#: lib/getopt.c:675
+#: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 # Pongo esto como en otros .po. sv
-#: lib/getopt.c:700
+#: lib/getopt.c:719
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
-#: lib/getopt.c:705
+#: lib/getopt.c:724
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: la opción `%c%s' no admite ningún argumento\n"
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:742 lib/getopt.c:915
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 #. --option
-#: lib/getopt.c:752
+#: lib/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción `--%s' no reconocida\n"
 #. +option or -option
-#: lib/getopt.c:756
+#: lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción `%c%s' no reconocida\n"
@@ -871,7 +871,7 @@ msgstr "%s: opci
 # a la cárcel (como mucho se cuelgan, je, je, 0ff0 :-). sv
 #
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
+#: lib/getopt.c:801
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción -- %c ilegal\n"
@@ -881,31 +881,31 @@ msgstr "%s: opci
 # Porque Enrique decía que le recordaba a disminuidos físicos.
 # Francamente, no creo que haya que andar con estas "fobias".
 # Pongo inválida. sv
-#: lib/getopt.c:785
+#: lib/getopt.c:804
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción -- %c inválida\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:834 lib/getopt.c:964
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción -- %c requiere un argumento\n"
-#: lib/getopt.c:862
+#: lib/getopt.c:881
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción `%s' es ambigua\n"
 # Pongo esto como en otros .po. sv
-#: lib/getopt.c:880
+#: lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `--%s' no admite ningún argumento\n"
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
-#: lib/obstack.c:477 lib/xmalloc.c:66
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
 #, fuzzy
 msgid "memory exhausted"
 msgstr "%s: memoria agotada\n"
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.28d\n"
+"Project-Id-Version: bison 1.29f\n"
-"POT-Creation-Date: 2001-10-02 18:30+0200\n"
+"POT-Creation-Date: 2001-10-26 14:37+0200\n"
-"PO-Revision-Date: 2001-08-29 17:06+02:00\n"
+"PO-Revision-Date: 2001-10-19 17:53+02:00\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr "liiga palju olekuid (maks %d)"
-#: lib/error.c:117 src/complain.c:96
+#: lib/error.c:128 lib/error.c:156 src/complain.c:96
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemi viga"
@@ -368,7 +368,7 @@ msgstr "reegel %-4d %s ->"
 #: src/print.c:240
 msgid "empty"
-msgstr ""
+msgstr "tühi"
 #. TERMINAL (type #) : rule #s terminal is on RHS
 #: src/print.c:244
@@ -704,68 +704,68 @@ msgstr ""
 "redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d reeglit"
 "%s.\n"
-#: lib/getopt.c:675
+#: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: võti `%s' on segane\n"
-#: lib/getopt.c:700
+#: lib/getopt.c:719
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: võti `--%s' ei luba argumenti\n"
-#: lib/getopt.c:705
+#: lib/getopt.c:724
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: võti `%c%s' ei luba argumenti\n"
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:742 lib/getopt.c:915
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: võti `%s' nõuab argumenti\n"
 #. --option
-#: lib/getopt.c:752
+#: lib/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: tundmatu võti `--%s'\n"
 #. +option or -option
-#: lib/getopt.c:756
+#: lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: tundmatu võti `%c%s'\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
+#: lib/getopt.c:801
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: lubamatu võti -- %c\n"
-#: lib/getopt.c:785
+#: lib/getopt.c:804
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: vigane võti -- %c\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:834 lib/getopt.c:964
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: võti nõuab argumenti -- %c\n"
-#: lib/getopt.c:862
+#: lib/getopt.c:881
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: võti `-W %s' on segane\n"
-#: lib/getopt.c:880
+#: lib/getopt.c:899
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: võti `-W %s' ei luba argumenti\n"
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
-#: lib/obstack.c:477 lib/xmalloc.c:66
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
 msgid "memory exhausted"
 msgstr "mälu on otsas"
@@ -790,12 +790,3 @@ msgstr "`"
 #: lib/quotearg.c:269
 msgid "'"
 msgstr "'"
 #~ msgid "\t\t/* empty */"
 #~ msgstr "\t\t/* tühi */"
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "korduvad %%header_extension eklaratsioonid"
 #~ msgid "multiple %%source_extension declarations"
 #~ msgstr "korduvad %%source_extension deklaratsioonid"
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU bison 1.28d\n"
+"Project-Id-Version: GNU bison 1.29f\n"
-"POT-Creation-Date: 2001-10-02 18:30+0200\n"
+"POT-Creation-Date: 2001-10-26 14:37+0200\n"
-"PO-Revision-Date: 2001-08-29 20:00-0500\n"
+"PO-Revision-Date: 2001-10-19 15:00-0500\n"
 "Last-Translator: Michel Robitaille <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr "nombre trop grand d'états (max %d)"
-#: lib/error.c:117 src/complain.c:96
+#: lib/error.c:128 lib/error.c:156 src/complain.c:96
 msgid "Unknown system error"
 msgstr "Erreur système inconnue"
@@ -374,7 +374,7 @@ msgstr "r
 #: src/print.c:240
 msgid "empty"
-msgstr ""
+msgstr "vide"
 #. TERMINAL (type #) : rule #s terminal is on RHS
 #: src/print.c:244
@@ -711,68 +711,68 @@ msgstr ""
 "la réduction de %s définit %d terminal%s, %d catégorie%s et %d production%"
 "s.\n"
-#: lib/getopt.c:675
+#: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: l'option %s est ambigüe\n"
-#: lib/getopt.c:700
+#: lib/getopt.c:719
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: l'option --%s n'admet pas de paramètre\n"
-#: lib/getopt.c:705
+#: lib/getopt.c:724
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: l'option %c%s n'admet pas de paramètre\n"
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:742 lib/getopt.c:915
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: l'option %s requiert un paramètre\n"
 #. --option
-#: lib/getopt.c:752
+#: lib/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: l'option --%s est inconnue\n"
 #. +option or -option
-#: lib/getopt.c:756
+#: lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: l'option %c%s est inconnue\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
+#: lib/getopt.c:801
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: option illégale -- %c\n"
-#: lib/getopt.c:785
+#: lib/getopt.c:804
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: option non valide -- %c\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:834 lib/getopt.c:964
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: l'option requiert un paramètre -- %c\n"
-#: lib/getopt.c:862
+#: lib/getopt.c:881
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: l'option `-W %s' est ambiguë\n"
-#: lib/getopt.c:880
+#: lib/getopt.c:899
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option `-W %s' n'admet pas de paramètre\n"
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
-#: lib/obstack.c:477 lib/xmalloc.c:66
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
 msgid "memory exhausted"
 msgstr "mémoire épuisée"
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
-"POT-Creation-Date: 2001-10-02 18:30+0200\n"
+"POT-Creation-Date: 2001-10-26 14:37+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"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr "%s の数が多すぎます (最大 %d)"
-#: lib/error.c:117 src/complain.c:96
+#: lib/error.c:128 lib/error.c:156 src/complain.c:96
 msgid "Unknown system error"
 msgstr ""
@@ -716,68 +716,68 @@ msgstr ""
 "還元ファイル %s で %d 個の終端子%.0s, %d 個の非終端子%.0s, %d 個の規則%.0sが"
 "定義されました\n"
-#: lib/getopt.c:675
+#: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: オプション `%s' は曖昧です\n"
-#: lib/getopt.c:700
+#: lib/getopt.c:719
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: オプション `--%s' は引数を許しません\n"
-#: lib/getopt.c:705
+#: lib/getopt.c:724
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: オプション `%c%s' は引数を許しません\n"
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:742 lib/getopt.c:915
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: オプション `%s' は引数を要求します\n"
 #. --option
-#: lib/getopt.c:752
+#: lib/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: 認識できないオプション `--%s' です\n"
 #. +option or -option
-#: lib/getopt.c:756
+#: lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: 認識できないオプション `%c%s' です\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
+#: lib/getopt.c:801
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: 定格外のオプション -- %c\n"
-#: lib/getopt.c:785
+#: lib/getopt.c:804
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: 無効なオプション -- %c\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:834 lib/getopt.c:964
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: オプションは引数を要求します -- %c\n"
-#: lib/getopt.c:862
+#: lib/getopt.c:881
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: オプション `-W %s' は曖昧です\n"
-#: lib/getopt.c:880
+#: lib/getopt.c:899
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: オプション `-W %s' は引数を許しません\n"
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
-#: lib/obstack.c:477 lib/xmalloc.c:66
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
 #, fuzzy
 msgid "memory exhausted"
 msgstr "%s: メモリを使い果たしました\n"
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-10-02 18:30+0200\n"
+"POT-Creation-Date: 2001-10-26 14:37+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"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr ""
-#: lib/error.c:117 src/complain.c:96
+#: lib/error.c:128 lib/error.c:156 src/complain.c:96
 msgid "Unknown system error"
 msgstr ""
@@ -719,68 +719,68 @@ msgstr ""
 "gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d productie"
 "%s.\n"
-#: lib/getopt.c:675
+#: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: optie `%s' is niet eenduidig\n"
-#: lib/getopt.c:700
+#: lib/getopt.c:719
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
-#: lib/getopt.c:705
+#: lib/getopt.c:724
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: optie `%c%s' staat geen argument toe\n"
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:742 lib/getopt.c:915
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: optie `%s' vereist een argument\n"
 #. --option
-#: lib/getopt.c:752
+#: lib/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: onbekende optie `--%s'\n"
 #. +option or -option
-#: lib/getopt.c:756
+#: lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: onbekende optie `%c%s'\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
+#: lib/getopt.c:801
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
-#: lib/getopt.c:785
+#: lib/getopt.c:804
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: onjuiste optie -- %c\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:834 lib/getopt.c:964
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: optie vereist een argument -- %c\n"
-#: lib/getopt.c:862
+#: lib/getopt.c:881
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: optie `%s' is niet eenduidig\n"
-#: lib/getopt.c:880
+#: lib/getopt.c:899
 #, fuzzy, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
-#: lib/obstack.c:477 lib/xmalloc.c:66
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
 #, fuzzy
 msgid "memory exhausted"
 msgstr "%s: geen geheugen meer beschikbaar\n"
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29\n"
-"POT-Creation-Date: 2001-10-02 18:30+0200\n"
+"POT-Creation-Date: 2001-10-26 14:37+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"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)"
-#: lib/error.c:117 src/complain.c:96
+#: lib/error.c:128 lib/error.c:156 src/complain.c:96
 msgid "Unknown system error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
@@ -708,68 +708,68 @@ msgstr ""
 "×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ "
 "×Ù×ÏÄÁ%s.\n"
-#: lib/getopt.c:675
+#: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
-#: lib/getopt.c:700
+#: lib/getopt.c:719
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
-#: lib/getopt.c:705
+#: lib/getopt.c:724
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:742 lib/getopt.c:915
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ\n"
 #. --option
-#: lib/getopt.c:752
+#: lib/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
 #. +option or -option
-#: lib/getopt.c:756
+#: lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
+#: lib/getopt.c:801
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
-#: lib/getopt.c:785
+#: lib/getopt.c:804
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:834 lib/getopt.c:964
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ËÌÀÞ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ -- %c\n"
-#: lib/getopt.c:862
+#: lib/getopt.c:881
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n"
-#: lib/getopt.c:880
+#: lib/getopt.c:899
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
-#: lib/obstack.c:477 lib/xmalloc.c:66
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
 msgid "memory exhausted"
 msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28c\n"
-"POT-Creation-Date: 2001-10-02 18:30+0200\n"
+"POT-Creation-Date: 2001-10-26 14:37+0200\n"
 "PO-Revision-Date: 2001-09-10 10:54GMT\n"
 "Last-Translator: Altug Bayram <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr "çok fazla durum (en fazla %d)"
-#: lib/error.c:117 src/complain.c:96
+#: lib/error.c:128 lib/error.c:156 src/complain.c:96
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatasý"
@@ -710,68 +710,68 @@ msgstr ""
 "indirgenen %s tanýmlanan %d sabit simge%s, %d deðiþken simge%s, ve %düretilen"
 "%s.\n"
-#: lib/getopt.c:675
+#: lib/getopt.c:694
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneði belirsiz\n"
-#: lib/getopt.c:700
+#: lib/getopt.c:719
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' seçeneði argümansýz kullanýlýr\n"
-#: lib/getopt.c:705
+#: lib/getopt.c:724
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: seçenek `%c%s' argümansýz kullanýlýr\n"
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:742 lib/getopt.c:915
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n"
 #. --option
-#: lib/getopt.c:752
+#: lib/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: `--%s' seçeneði bilinmiyor\n"
 #. +option or -option
-#: lib/getopt.c:756
+#: lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: `%c%s' seçeneði bilinmiyor\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:782
+#: lib/getopt.c:801
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: kuraldýþý seçenek -- %c\n"
-#: lib/getopt.c:785
+#: lib/getopt.c:804
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 #. 1003.2 specifies the format of this message.
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:834 lib/getopt.c:964
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: seçenek bir argümanla kullanýlýr -- %c\n"
-#: lib/getopt.c:862
+#: lib/getopt.c:881
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' seçeneði belirsiz\n"
-#: lib/getopt.c:880
+#: lib/getopt.c:899
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneði argümansýz kullanýlýr\n"
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
-#: lib/obstack.c:477 lib/xmalloc.c:66
+#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
 msgid "memory exhausted"
 msgstr "bellek tükendi"
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
 # @configure_input@
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +44,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,7 +59,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -66,7 +73,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -79,10 +86,8 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -183,9 +188,7 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  src/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -224,7 +227,7 @@ ANSI2KNR = ../lib/ansi2knr
 	cd ../lib && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 mostlyclean-kr:
-	-rm -f *_.c
+	-test "$U" = "" || rm -f *_.c
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/LR0$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/closure$U.Po@am__quote@
@@ -356,7 +359,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
 GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
@@ -72,6 +72,10 @@
 # endif /* alloca not defined */
 #endif /* YYSTACK_USE_ALLOCA not defined */
 #ifndef YYSTACK_USE_ALLOCA
 # define YYSTACK_USE_ALLOCA 0
 #endif
 #if YYSTACK_USE_ALLOCA
 # define YYSTACK_ALLOC alloca
 #else
@@ -358,7 +362,7 @@ yyparse (YYPARSE_PARAM_ARG)
     have just been pushed. so pushing a state here evens the stacks.
     */
  yyssp++;
-  
+
 yysetstate:
  *yyssp = yystate;
@@ -416,7 +420,7 @@ yyparse (YYPARSE_PARAM_ARG)
      yystacksize *= 2;
      if (yystacksize > YYMAXDEPTH)
 	yystacksize = YYMAXDEPTH;
-# ifndef YYSTACK_USE_ALLOCA
+# if !YYSTACK_USE_ALLOCA
      yyfree_stacks = 1;
 # endif
      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
@@ -28,7 +28,6 @@ TESTSUITE_AT = \
 	output.at calc.at regression.at
 TESTSUITE = $(srcdir)/testsuite
 AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
 	$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
@@ -1,4 +1,5 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.5a from Makefile.am.
 # @configure_input@
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +44,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,7 +59,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AUTOM4TE = @AUTOM4TE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -66,7 +73,7 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
+GCC = @GCC@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -79,10 +86,8 @@ INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -107,7 +112,6 @@ TESTSUITE_AT = \
 TESTSUITE = $(srcdir)/testsuite
 AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -122,11 +126,9 @@ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  tests/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 	  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
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 uninstall-info-am:
 tags: TAGS
 TAGS:
@@ -6,5 +6,8 @@
 CC='@CC@'
 CFLAGS='@CFLAGS@'
 # We need to know if the compiler is GCC.
 GCC='@GCC@'
 # We need `config.h'.
 CPPFLAGS="-I $top_builddir @CPPFLAGS@"
@@ -256,8 +256,8 @@ main (int argc, const char **argv)
 # Produce `calc.y'.
 m4_define([AT_DATA_CALC_Y],
 [_AT_DATA_CALC_Y($[1], $[2], $[3],
-                 [m4_match([$1], [--yyerror-verbose],
+                 [m4_bmatch([$1], [--yyerror-verbose],
-                           [[#define YYERROR_VERBOSE]])])])
+                            [[#define YYERROR_VERBOSE]])])])
@@ -273,8 +273,8 @@ m4_define([_AT_CHECK_CALC],
 ]])
 AT_CHECK([calc input], 0, [], [stderr])dnl
 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
-         [m4_match([$1], [--debug],
+         [m4_bmatch([$1], [--debug],
-                   [$3], [0])
+                    [$3], [0])
 ])
 ])
@@ -302,17 +302,17 @@ AT_CHECK([calc input], 0, [], [stderr])
 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
-         [m4_match([$1], [--debug],
+         [m4_bmatch([$1], [--debug],
-                   [$3], [1])
+                    [$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
+[m4_bmatch([$1], [--location], [$4: ])[]dnl
 parse error[]dnl
-m4_match([$1], [--yyerror-verbose], [, $5])[]dnl
+m4_bmatch([$1], [--yyerror-verbose], [, $5])[]dnl
 ])
@@ -330,9 +330,15 @@ AT_SETUP([Calculator $1])
 AT_DATA_CALC_Y([$1])
 # Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison calc.y -o calc.c m4_patsubst([$1], [--yyerror-verbose])],
+AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
         [0], [], [])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [])
+
 # Some compilers issue warnings we don't want to hear about.
 # Maybe some day we will have proper Autoconf macros to disable these
 # warnings, but this place is not the right one for that.
 # So let's keep only GCC warnings, which we know are sane.
 AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [stderr])
 AT_CHECK([if test "$GCC" = yes; then cat stderr; else true; fi])
 # Test the priorities.
 _AT_CHECK_CALC([$1],
Author	SHA1	Message	Date
Akim Demaille	63cf44e7ac	Update and Regen.	2001-10-29 08:51:57 +00:00
Akim Demaille	9507085cf3	Regen.	2001-10-26 14:33:02 +00:00
Akim Demaille	8d3c8c3643	Version 1.30.	2001-10-26 13:43:20 +00:00
Akim Demaille	16c9da79ef	Update.	2001-10-26 13:29:29 +00:00
Akim Demaille	d0132d6bec	Regen.	2001-10-26 13:10:17 +00:00
Paul Eggert	1306676ce3	Sync with fileutils 4.1.1.	2001-10-26 07:04:29 +00:00
Akim Demaille	e18cda8b5e	.	2001-10-18 16:21:33 +00:00
Akim Demaille	ddf896eb8e	Version 1.29f. * tests/calc.at (_AT_CHECK_CALC_ERROR): Don't use `foo && bar', to avoid spurious failures.	2001-10-18 16:18:54 +00:00
Akim Demaille	9aadbdf371	.	2001-10-18 15:29:38 +00:00
Akim Demaille	f1b769ff28	Version 1.29e.	2001-10-18 15:26:36 +00:00
Akim Demaille	94ff2b9475	* tests/atlocal.in (GCC): Add. * tests/calc.at: s/m4_match/m4_bmatch/. s/m4_patsubst/m4_bpatsubst/. (AT_CHECK_CALC): Check the compiler's stderr only if it's GCC. * configure.in: AC_SUBST(GCC).	2001-10-18 15:24:53 +00:00
Akim Demaille	470d206b2e	* m4/m4.m4: Remove. * configure.in: M4 is no longer needed, but autom4te is. * tests/Makefile.am (AUTOTEST): Don't define AUTOM4TE, let AC_SUBST do it.	2001-10-10 15:24:02 +00:00
Akim Demaille	08f0a4e409	Bump to 1.29e.	2001-10-10 15:19:58 +00:00
Akim Demaille	00fda01856	.	2001-10-10 15:09:16 +00:00
Akim Demaille	bf31619762	* src/bison.simple: Be sure to set YYSTACK_USE_ALLOCA. Use `#if , not `#ifndef'. Reported by Airy Andre.	2001-10-10 14:59:46 +00:00
Akim Demaille	31a743b2bb	* src/bison.simple: Be sure to set YYSTACK_USE_ALLOCA. Use `#if YYSTACK_USE_ALLOCA', not `#ifdef'. Reported by Airy Andre.	2001-10-10 14:52:20 +00:00
Akim Demaille	48b43d9d83	Remove.	2001-10-10 14:43:44 +00:00
Akim Demaille	4b9e71f993	Version 1.29d.	2001-10-10 14:39:31 +00:00
Akim Demaille	16cd214585	* INSTALL, config/config.guess, config/config.sub, config/mdate-sh * config/mkinstalldirs, lib/ansi2knr.c: Update.	2001-10-10 14:39:11 +00:00
Paul Eggert	f2c7ab2c1f	Explain better why the output file no longer defines 'const', and explain what to do about it if this still matters to you.	2001-10-02 18:09:13 +00:00
Akim Demaille	2c377512c2	Bump 1.29d.	2001-10-02 16:52:33 +00:00
Akim Demaille	74c3b26d85	.	2001-10-02 16:28:21 +00:00