merge of gnulib into Bison

[Paul Eggert]

CVS Bison didn't build on Solaris 7 due to problems with strnlen
(Solaris 7 lacks it, but Bison mishandles this case).  Recent gnulib
versions fix this problem, apparently, so I merged the latest gnulib
into Bison as follows.  This patch doesn't list all the contents of
the new files; for that, you can see gnulib.

2003-03-12  Paul Eggert  <address@hidden>

        Merge changes from gnulib.  This was prompted because the CVS
        snapshot didn't build on Solaris 7 due to strnlen problems.

        These changes need to be merged back into gnulib:
        * lib/hash.c: Include <stdbool.h> unconditionally.
        * m4/onceonly.m4 (m4_quote): New macro.
        (AC_CHECK_HEADERS_ONCE, AC_CHECK_FUNCS_ONCE, AC_CHECK_DECLS_ONCE):
        Quote AC_FOREACH variable-expansions properly.
        The 2003-01-03 obstack.h change also needs merging.
        {end of changes requiring merging}
        
        * lib/stdbool.h.in, m4/alloca.m4, m4/dirname.m4, m4/dos.m4,
        m4/getopt.m4, m4/hash.m4, m4/malloc.m4, m4/memchr.m4,
        m4/memrchr.m4, m4/obstack.m4, m4/onceonly.m4, m4/quote.m4,
        m4/quotearg.m4, m4/realloc.m4, m4/stpcpy.m4, m4/strnlen.m4,
        m4/strtol.m4, m4/strtoul.m4, m4/unlocked-io.m4, m4/xalloc.m4:
        New files, imported from gnulib.
        * m4/Makefile.am (EXTRA_DIST): Add the new m4/*.m4 files mentioned
        above.

        * lib/mbswidth.c, m4/error.m4, m4/mbrtowc.m4, m4/mbswidth.m4,
        m4/memcmp.m4, m4/prereq.m4, m4/stdbool.m4: Update to current
        gnulib sources.

        * configure.ac (gl_DIRNAME, gl_GETOPT, gl_HASH, gl_QUOTE, gl_XALLOC):
        Add.
        (gl_ERROR): New, replacing jm_PREREQ_ERROR.
        (gl_FUNC_ALLOCA): New, replacing AC_FUNC_ALLOCA.
        (gl_FUNC_STPCPY): New, replacing AC_REPLACE_FUNCS(stpcpy).
        (gl_FUNC_STRNLEN): New, replacing AC_FUNC_STRNLEN.
        (gl_MBSWIDTH): New, replacing jm_PREREQ_MBSWIDTH.
        (gl_OBSTACK): New, replacing AC_FUNC_OBSTACK.
        (gl_QUOTEARG): New, replacing jm_PREREQ_QUOTEARG.
        (jm_FUNC_GLIBC_UNLOCKED_IO, gl_FUNC_STPCPY, gl_FUNC_STRTOL): New.
        (jm_FUNC_MALLOC): New, replacing AC_FUNC_MALLOC.
        (jm_FUNC_REALLOC): New, replacing AC_FUNC_REALLOC.
        (jm_PREREQ_ARGMATCH): Remove.
        (AC_REPLACE_FUNCS): Remove memchr, memrchr, stpcpy, strtol, strtoul.
        * lib/Makefile.am (libbison_a_SOURCES): Add argmatch.c, argmatch.h.

        * src/system.h: Include <stdbool.h> unconditionally.

Index: configure.ac
===================================================================
RCS file: /cvsroot/bison/bison/configure.ac,v
retrieving revision 1.33
diff -p -u -r1.33 configure.ac
--- configure.ac        6 Feb 2003 10:04:29 -0000       1.33
+++ configure.ac        12 Mar 2003 23:03:17 -0000
@@ -96,25 +96,33 @@ AC_C_INLINE
 AC_CHECK_TYPES([uintptr_t])
 
 # Checks for library functions.
-AC_FUNC_ALLOCA
-AC_FUNC_OBSTACK
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_STRNLEN
 AC_CHECK_FUNCS(setlocale)
 AC_CHECK_DECLS([free, getenv, getopt,
                 stpcpy, strchr, strspn, strnlen,
                 malloc, memchr, memrchr])
-AC_REPLACE_FUNCS(memchr memrchr \
-                 strchr stpcpy strrchr strspn strtol strtoul)
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-jm_PREREQ_MBSWIDTH
-jm_PREREQ_QUOTEARG
-jm_FUNC_ARGMATCH
-jm_PREREQ_ERROR
+AC_REPLACE_FUNCS(strchr strrchr strspn)
+AC_FUNC_ERROR_AT_LINE
 AM_WITH_DMALLOC
 BISON_PREREQ_SUBPIPE
 BISON_PREREQ_TIMEVAR
+gl_DIRNAME
+gl_ERROR
+gl_FUNC_ALLOCA
+gl_FUNC_MEMCHR
+gl_FUNC_MEMRCHR
+gl_FUNC_STPCPY
+gl_FUNC_STRNLEN
+gl_FUNC_STRTOL
+gl_GETOPT
+gl_HASH
+gl_MBSWIDTH
+gl_OBSTACK
+gl_QUOTE
+gl_QUOTEARG
+gl_XALLOC
+jm_FUNC_GLIBC_UNLOCKED_IO
+jm_FUNC_MALLOC
+jm_FUNC_REALLOC
 
 # Gettext.
 AM_GNU_GETTEXT(external, need-ngettext)
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/bison/bison/lib/Makefile.am,v
retrieving revision 1.38
diff -p -u -r1.38 Makefile.am
--- lib/Makefile.am     9 Jan 2003 12:45:08 -0000       1.38
+++ lib/Makefile.am     12 Mar 2003 23:03:18 -0000
@@ -35,6 +35,7 @@ EXTRA_DIST = malloc.c realloc.c strnlen.
 
 libbison_a_SOURCES = \
   gettext.h \
+  argmatch.c argmatch.h \
   basename.c dirname.h dirname.c \
   get-errno.h get-errno.c \
   getopt.h getopt.c getopt1.c \
Index: lib/hash.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/hash.c,v
retrieving revision 1.10
diff -p -u -r1.10 hash.c
--- lib/hash.c  3 Jan 2003 14:14:24 -0000       1.10
+++ lib/hash.c  12 Mar 2003 23:03:18 -0000
@@ -31,24 +31,7 @@
 # include <stdlib.h>
 #endif
 
-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# ifndef __bool_true_false_are_defined
-#  if ! HAVE__BOOL
-#   ifdef __cplusplus
-typedef bool _Bool;
-#   else
-typedef unsigned char _Bool;
-#   endif
-#  endif
-#  define bool _Bool
-#  define false 0
-#  define true 1
-#  define __bool_true_false_are_defined 1
-# endif
-#endif
-
+#include <stdbool.h>
 #include <stdio.h>
 
 #ifndef HAVE_DECL_FREE
Index: lib/mbswidth.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/mbswidth.c,v
retrieving revision 1.3
diff -p -u -r1.3 mbswidth.c
--- lib/mbswidth.c      28 Feb 2003 09:00:22 -0000      1.3
+++ lib/mbswidth.c      12 Mar 2003 23:03:18 -0000
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002 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
@@ -21,15 +21,6 @@
 # include <config.h>
 #endif
 
-/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth().  This must be
-   included before "mbswidth.h", because UnixWare 7.1.1 <wchar.h>
-   declares its own mbswidth and we want mbswidth.h's "#define
-   mbswidth gnu_mbswidth" to take effect after <wchar.h> is
-   included.  */
-#if HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-
 /* Specification.  */
 #include "mbswidth.h"
 
@@ -40,6 +31,11 @@
 
 /* Get isprint().  */
 #include <ctype.h>
+
+/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth().  */
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
 
 /* Get iswprint(), iswcntrl().  */
 #if HAVE_WCTYPE_H
Index: m4/Makefile.am
===================================================================
RCS file: /cvsroot/bison/bison/m4/Makefile.am,v
retrieving revision 1.23
diff -p -u -r1.23 Makefile.am
--- m4/Makefile.am      3 Nov 2002 08:40:08 -0000       1.23
+++ m4/Makefile.am      12 Mar 2003 23:03:18 -0000
@@ -1,6 +1,11 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 EXTRA_DIST = \
-  dmalloc.m4 error.m4 \
-  m4.m4 mbrtowc.m4 mbswidth.m4 memcmp.m4 \
-  prereq.m4 stdbool.m4 subpipe.m4 timevar.m4 warning.m4 \
+  alloca.m4 dirname.m4 dmalloc.m4 dos.m4 error.m4 getopt.m4 hash.m4 \
+  m4.m4 malloc.m4 \
+  mbrtowc.m4 mbswidth.m4 memchr.m4 memcmp.m4 memrchr.m4 \
+  obstack.m4 onceonly.m4 \
+  prereq.m4 quote.m4 quotearg.m4 \
+  realloc.m4 stdbool.m4 \
+  stpcpy.m4 strnlen.m4 strtol.m4 strtoul.m4 \
+  subpipe.m4 timevar.m4 unlocked-io.m4 warning.m4 xalloc.m4 \
   gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4
Index: m4/error.m4
===================================================================
RCS file: /cvsroot/bison/bison/m4/error.m4,v
retrieving revision 1.3
diff -p -u -r1.3 error.m4
--- m4/error.m4 26 Oct 2001 07:26:00 -0000      1.3
+++ m4/error.m4 12 Mar 2003 23:03:18 -0000
@@ -1,13 +1,20 @@
-#serial 4
+#serial 5
 
-dnl FIXME: put these prerequisite-only *.m4 files in a separate
-dnl directory -- otherwise, they'll conflict with existing files.
+AC_DEFUN([gl_ERROR],
+[
+  AC_FUNC_ERROR_AT_LINE
+  dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
+  if test $ac_cv_lib_error_at_line = no; then
+    jm_PREREQ_ERROR
+  fi
+])
 
-dnl These are the prerequisite macros for GNU's error.c file.
+# Prerequisites of lib/error.c.
 AC_DEFUN([jm_PREREQ_ERROR],
 [
-  AC_CHECK_FUNCS(strerror vprintf doprnt)
+  AC_REQUIRE([AC_HEADER_STDC])
+  AC_CHECK_FUNCS_ONCE(doprnt vprintf)
+  AC_CHECK_FUNCS(strerror)
   AC_CHECK_DECLS([strerror])
   AC_FUNC_STRERROR_R
-  AC_HEADER_STDC
 ])
Index: m4/mbrtowc.m4
===================================================================
RCS file: /cvsroot/bison/bison/m4/mbrtowc.m4,v
retrieving revision 1.3
diff -p -u -r1.3 mbrtowc.m4
--- m4/mbrtowc.m4       12 Aug 2002 14:26:37 -0000      1.3
+++ m4/mbrtowc.m4       12 Mar 2003 23:03:18 -0000
@@ -1,4 +1,4 @@
-# mbrtowc.m4 serial 4 (fileutils-4.1.3)
+# mbrtowc.m4 serial 5
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -7,6 +7,9 @@ dnl that contains a configuration script
 dnl the same distribution terms as the rest of that program.
 
 dnl From Paul Eggert
+
+dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with
+dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere.
 
 AC_DEFUN([jm_FUNC_MBRTOWC],
 [
Index: m4/mbswidth.m4
===================================================================
RCS file: /cvsroot/bison/bison/m4/mbswidth.m4,v
retrieving revision 1.2
diff -p -u -r1.2 mbswidth.m4
--- m4/mbswidth.m4      24 Dec 2002 08:15:17 -0000      1.2
+++ m4/mbswidth.m4      12 Mar 2003 23:03:18 -0000
@@ -1,12 +1,13 @@
-#serial 8
+#serial 9
 
 dnl autoconf tests required for use of mbswidth.c
 dnl From Bruno Haible.
 
-AC_DEFUN([jm_PREREQ_MBSWIDTH],
+AC_DEFUN([gl_MBSWIDTH],
 [
-  AC_CHECK_HEADERS(wchar.h wctype.h)
-  AC_CHECK_FUNCS(isascii iswcntrl iswprint mbsinit wcwidth)
+  AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
+  AC_CHECK_FUNCS_ONCE(isascii iswprint mbsinit)
+  AC_CHECK_FUNCS(iswcntrl wcwidth)
   jm_FUNC_MBRTOWC
 
   AC_CACHE_CHECK([whether wcwidth is declared], ac_cv_have_decl_wcwidth,
Index: m4/memcmp.m4
===================================================================
RCS file: /cvsroot/bison/bison/m4/memcmp.m4,v
retrieving revision 1.1
diff -p -u -r1.1 memcmp.m4
--- m4/memcmp.m4        13 Sep 2002 16:12:21 -0000      1.1
+++ m4/memcmp.m4        12 Mar 2003 23:03:18 -0000
@@ -1,9 +1,22 @@
-#serial 7
+# memcmp.m4 serial 8
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 AC_DEFUN([jm_FUNC_MEMCMP],
-[AC_REQUIRE([AC_FUNC_MEMCMP])dnl
- if test $ac_cv_func_memcmp_working = no; then
-   AC_DEFINE(memcmp, rpl_memcmp,
-     [Define to rpl_memcmp if the replacement function should be used.])
- fi
+[
+  AC_REQUIRE([AC_FUNC_MEMCMP])
+  if test $ac_cv_func_memcmp_working = no; then
+    AC_DEFINE(memcmp, rpl_memcmp,
+      [Define to rpl_memcmp if the replacement function should be used.])
+    gl_PREREQ_MEMCMP
+  fi
+])
+
+# Prerequisites of lib/memcmp.c.
+AC_DEFUN([gl_PREREQ_MEMCMP], [
+  AC_CHECK_HEADERS_ONCE(string.h)
 ])
Index: m4/prereq.m4
===================================================================
RCS file: /cvsroot/bison/bison/m4/prereq.m4,v
retrieving revision 1.8
diff -p -u -r1.8 prereq.m4
--- m4/prereq.m4        15 Nov 2002 16:30:37 -0000      1.8
+++ m4/prereq.m4        12 Mar 2003 23:03:18 -0000
@@ -1,188 +1,31 @@
-#serial 28                                                         -*- 
Autoconf -*-
+#serial 27
 
-dnl We use jm_ for non Autoconf macros.
-m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
-
-# These are the prerequisite macros for files in the lib/
-# directories of the fileutils, sh-utils, and textutils packages.
+dnl These are the prerequisite macros for files in the lib/
+dnl directories of the fileutils, sh-utils, and textutils packages.
 
 AC_DEFUN([jm_PREREQ],
 [
-  jm_PREREQ_ADDEXT
+  gl_BACKUPFILE
   jm_PREREQ_C_STACK
-  jm_PREREQ_CANON_HOST
-  jm_PREREQ_DIRNAME
+  gl_CANON_HOST
+  gl_DIRNAME
   jm_PREREQ_ERROR
-  jm_PREREQ_EXCLUDE
-  jm_PREREQ_GETPAGESIZE
-  jm_PREREQ_HARD_LOCALE
-  jm_PREREQ_HASH
-  jm_PREREQ_HUMAN
-  jm_PREREQ_MBSWIDTH
-  jm_PREREQ_MEMCHR
-  jm_PREREQ_PHYSMEM
-  jm_PREREQ_POSIXVER
-  jm_PREREQ_QUOTEARG
-  jm_PREREQ_READUTMP
-  jm_PREREQ_REGEX
+  gl_EXCLUDE
+  gl_GETPAGESIZE
+  gl_HARD_LOCALE
+  gl_HASH
+  gl_HUMAN
+  gl_MBSWIDTH
+  gl_FUNC_MEMCHR
+  gl_PHYSMEM
+  gl_POSIXVER
+  gl_QUOTEARG
+  gl_READUTMP
+  gl_REGEX
   jm_PREREQ_STAT
-  jm_PREREQ_STRNLEN
-  jm_PREREQ_TEMPNAME # called by mkstemp
-  jm_PREREQ_XGETCWD
-  jm_PREREQ_XREADLINK
-])
-
-AC_DEFUN([jm_PREREQ_ARGMATCH],
-[
-  AC_REQUIRE([jm_PREREQ_QUOTEARG])
-  AC_REPLACE_FUNCS(strcasecmp strncasecmp)
-])
-
-# Ask for argmatch.[ch], and set it up.
-AC_DEFUN([jm_FUNC_ARGMATCH],
-[
-  AC_REQUIRE([jm_PREREQ_ARGMATCH])
-  AC_LIBOBJ([argmatch])
-  AC_LIBSOURCES([argmatch.c, argmatch.h])
-])
-
-AC_DEFUN([jm_PREREQ_ADDEXT],
-[
-  dnl For addext.c.
-  AC_SYS_LONG_FILE_NAMES
-  AC_CHECK_FUNCS(pathconf)
-  AC_CHECK_HEADERS(limits.h string.h unistd.h)
-])
-
-AC_DEFUN([jm_PREREQ_CANON_HOST],
-[
-  dnl Add any libraries as early as possible.
-  dnl In particular, inet_ntoa needs -lnsl at least on Solaris5.5.1,
-  dnl so we have to add -lnsl to LIBS before checking for that function.
-  AC_SEARCH_LIBS(gethostbyname, [inet nsl])
-
-  dnl These come from -lnsl on Solaris5.5.1.
-  AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
-
-  AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
-  AC_CHECK_HEADERS(unistd.h string.h netdb.h sys/socket.h \
-                   netinet/in.h arpa/inet.h)
-])
-
-AC_DEFUN([jm_PREREQ_DIRNAME],
-[
-  AC_HEADER_STDC
-  AC_CHECK_HEADERS(string.h)
-])
-
-AC_DEFUN([jm_PREREQ_EXCLUDE],
-[
-  AC_FUNC_FNMATCH_GNU
-  AC_HEADER_STDBOOL
-])
-
-AC_DEFUN([jm_PREREQ_GETPAGESIZE],
-[
-  AC_CHECK_FUNCS(getpagesize)
-  AC_CHECK_HEADERS(OS.h unistd.h)
-])
-
-AC_DEFUN([jm_PREREQ_HARD_LOCALE],
-[
-  AC_CHECK_HEADERS(locale.h stdlib.h string.h)
-  AC_CHECK_FUNCS(setlocale)
-  AM_C_PROTOTYPES
-])
-
-# If you use human.c, you need the following files:
-# inttypes.m4 ulonglong.m4
-AC_DEFUN([jm_PREREQ_HUMAN],
-[
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h)
-  AC_CHECK_DECLS([getenv])
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
-])
-
-AC_DEFUN([jm_PREREQ_MEMCHR],
-[
-  AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h)
-])
-
-AC_DEFUN([jm_PREREQ_PHYSMEM],
-[
-  AC_CHECK_HEADERS(sys/pstat.h unistd.h)
-  AC_CHECK_FUNCS(pstat_getstatic pstat_getdynamic)
-])
-
-AC_DEFUN([jm_PREREQ_POSIXVER],
-[
-  AC_CHECK_HEADERS(unistd.h)
-  AC_CHECK_DECLS([getenv])
-])
-
-AC_DEFUN([jm_PREREQ_QUOTEARG],
-[
-  AC_CHECK_FUNCS(isascii iswprint)
-  jm_FUNC_MBRTOWC
-  jm_FUNC_MEMCMP
-  AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
-  AC_HEADER_STDC
-  AC_C_BACKSLASH_A
-  AC_TYPE_MBSTATE_T
-  AM_C_PROTOTYPES
-])
-
-AC_DEFUN([jm_PREREQ_READUTMP],
-[
-  AC_HEADER_STDC
-  AC_CHECK_HEADERS(string.h utmp.h utmpx.h sys/param.h)
-  AC_CHECK_FUNCS(utmpname)
-  AC_CHECK_FUNCS(utmpxname)
-  AM_C_PROTOTYPES
-
-  if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
-    utmp_includes="\
-$ac_includes_default
-#ifdef HAVE_UTMPX_H
-# include <utmpx.h>
-#endif
-#ifdef HAVE_UTMP_H
-# include <utmp.h>
-#endif
-"
-    AC_CHECK_MEMBERS([struct utmpx.ut_user],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmp.ut_user],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmpx.ut_name],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmp.ut_name],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmpx.ut_type],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmp.ut_type],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmpx.ut_pid],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmp.ut_pid],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmpx.ut_id],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmp.ut_id],,,[$utmp_includes])
-
-    AC_CHECK_MEMBERS([struct utmpx.ut_exit.ut_exit],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmp.ut_exit.ut_exit],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_exit],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmp.ut_exit.e_exit],,,[$utmp_includes])
-
-    AC_CHECK_MEMBERS([struct utmpx.ut_exit.ut_termination],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmp.ut_exit.ut_termination],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_termination],,,[$utmp_includes])
-    AC_CHECK_MEMBERS([struct utmp.ut_exit.e_termination],,,[$utmp_includes])
-    AC_LIBOBJ(readutmp)
-  fi
-])
-
-AC_DEFUN([jm_PREREQ_REGEX],
-[
-  dnl FIXME: Maybe provide a btowc replacement someday: solaris-2.5.1 lacks it.
-  dnl FIXME: Check for wctype and iswctype, and and add -lw if necessary
-  dnl to get them.
-  AC_CHECK_FUNCS(bzero bcopy isascii btowc)
-  AC_CHECK_HEADERS(alloca.h libintl.h wctype.h wchar.h)
-  AC_HEADER_STDC
-  AC_FUNC_ALLOCA
+  gl_FUNC_STRNLEN
+  gl_XGETCWD
+  gl_XREADLINK
 ])
 
 AC_DEFUN([jm_PREREQ_STAT],
@@ -217,42 +60,4 @@ $ac_includes_default
   AC_CHECK_MEMBERS([struct statvfs.f_namemax],,,[$statxfs_includes])
   AC_CHECK_MEMBERS([struct statfs.f_namelen],,,[$statxfs_includes])
   AC_CHECK_MEMBERS([struct statvfs.f_namelen],,,[$statxfs_includes])
-])
-
-AC_DEFUN([jm_PREREQ_STRNLEN],
-[
-  AC_FUNC_STRNLEN
-  AC_HEADER_STDC
-  AC_CHECK_HEADERS(memory.h)
-  AC_CHECK_DECLS([memchr])
-
-  # This is necessary because automake-1.6.1 doesn't understand
-  # that the above use of AC_FUNC_STRNLEN means we may have to use
-  # lib/strnlen.c.
-  test $ac_cv_func_strnlen_working = yes \
-    && AC_LIBOBJ(strnlen)
-])
-
-AC_DEFUN([jm_PREREQ_TEMPNAME],
-[
-  AC_HEADER_STDC
-  AC_HEADER_STAT
-  AC_CHECK_HEADERS(fcntl.h sys/time.h stdint.h unistd.h)
-  AC_CHECK_FUNCS(__secure_getenv gettimeofday)
-  AC_CHECK_DECLS([getenv])
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
-])
-
-AC_DEFUN([jm_PREREQ_XGETCWD],
-[
-  AC_C_PROTOTYPES
-  AC_CHECK_HEADERS(limits.h stdlib.h sys/param.h unistd.h)
-  AC_CHECK_FUNCS(getcwd)
-  AC_FUNC_GETCWD_NULL
-])
-
-AC_DEFUN([jm_PREREQ_XREADLINK],
-[
-  AC_C_PROTOTYPES
-  AC_CHECK_HEADERS(limits.h stdlib.h sys/types.h unistd.h)
 ])
Index: m4/stdbool.m4
===================================================================
RCS file: /cvsroot/bison/bison/m4/stdbool.m4,v
retrieving revision 1.1
diff -p -u -r1.1 stdbool.m4
--- m4/stdbool.m4       22 Oct 2002 04:36:31 -0000      1.1
+++ m4/stdbool.m4       12 Mar 2003 23:03:18 -0000
@@ -1,6 +1,6 @@
 # Check for stdbool.h that conforms to C99.
 
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002-2003 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
@@ -17,6 +17,32 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
+# Prepare for substituting <stdbool.h> if it is not supported.
+
+AC_DEFUN([AM_STDBOOL_H],
+[
+  AC_REQUIRE([AC_HEADER_STDBOOL])
+
+  # Define two additional variables used in the Makefile substitution.
+
+  if test "$ac_cv_header_stdbool_h" = yes; then
+    STDBOOL_H=''
+  else
+    STDBOOL_H='stdbool.h'
+  fi
+  AC_SUBST([STDBOOL_H])
+
+  if test "$ac_cv_type__Bool" = yes; then
+    HAVE__BOOL=1
+  else
+    HAVE__BOOL=0
+  fi
+  AC_SUBST([HAVE__BOOL])
+])
+
+# This macro is only needed in autoconf <= 2.54.  Newer versions of autoconf
+# have this macro built-in.
+
 AC_DEFUN([AC_HEADER_STDBOOL],
   [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
      [ac_cv_header_stdbool_h],
@@ -57,6 +83,7 @@ AC_DEFUN([AC_HEADER_STDBOOL],
        [ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ],
        [ac_cv_header_stdbool_h=yes],
        [ac_cv_header_stdbool_h=no])])
+   AC_CHECK_TYPES([_Bool])
    if test $ac_cv_header_stdbool_h = yes; then
      AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.])
    fi])
Index: src/system.h
===================================================================
RCS file: /cvsroot/bison/bison/src/system.h,v
retrieving revision 1.60
diff -p -u -r1.60 system.h
--- src/system.h        3 Feb 2003 15:35:57 -0000       1.60
+++ src/system.h        12 Mar 2003 23:03:18 -0000
@@ -183,23 +183,7 @@ void *memrchr (const void *str, int ch, 
 | Booleans.  |
 `-----------*/
 
-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# ifndef __bool_true_false_are_defined
-#  if ! HAVE__BOOL
-#   ifdef __cplusplus
-typedef bool _Bool;
-#   else
-typedef unsigned char _Bool;
-#   endif
-#  endif
-#  define bool _Bool
-#  define false 0
-#  define true 1
-#  define __bool_true_false_are_defined 1
-# endif
-#endif
+#include <stdbool.h>
 
 
 /*-----------.