merged latest gnulib

[Paul Eggert]

I installed the following patch to merge the latest version of gnulib
into Bison.

2003-06-16  Paul Eggert  <address@hidden>

        Upgrade to CVS gnulib.
        * configure.ac (AM_STDBOOL_H): Invoke this instead of AC_HEADER_STDBOOL.
        (AM_GNU_GETTEXT): Put brackets around args, as latest manual suggests.
        (AM_GNU_GETTEXT_VERSION): Update to 0.12.1.
        * lib/Makefile.am (EXTRA_DIST): Add stdbool_.h.
        (MOSTLYCLEANFILES): New var.
        ($(libbison_a_OBJECTS)): Depend on $(STDBOOL_H).
        (stdbool.h): New rule.
        * lib/dirname.c, lib/dirname.h, lib/hash.c, lib/hash.h,
        lib/malloc.c, lib/obstack.h, lib/quote.c, lib/realloc.c,
        lib/strcasecmp.c, lib/xalloc.h, m4/alloca.m4, m4/onceonly.m4,
        m4/quote.m4: Upgrade to today's gnulib.

Index: configure.ac
===================================================================
RCS file: /cvsroot/bison/bison/configure.ac,v
retrieving revision 1.36
diff -p -u -r1.36 configure.ac
--- configure.ac        2 Jun 2003 07:25:30 -0000       1.36
+++ configure.ac        16 Jun 2003 19:34:16 -0000
@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED([M4], ["$M4"], [Defin
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([ctype.h locale.h memory.h stdlib.h string.h unistd.h])
-AC_HEADER_STDBOOL
+AM_STDBOOL_H
 
 # Checks for compiler characteristics.
 AC_C_INLINE
@@ -126,8 +126,8 @@ jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
 # Gettext.
-AM_GNU_GETTEXT(external, need-ngettext)
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION(0.12.1)
 
 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/bison/bison/lib/Makefile.am,v
retrieving revision 1.39
diff -p -u -r1.39 Makefile.am
--- lib/Makefile.am     12 Mar 2003 23:08:11 -0000      1.39
+++ lib/Makefile.am     16 Jun 2003 19:34:16 -0000
@@ -31,7 +31,15 @@ liby_a_SOURCES = main.c yyerror.c
 # Heck, we are still using an old version of Automake which does not
 # understand inner AC_LIBOBJ (i.e., from Autoconf itself, not from
 # configure.in).
-EXTRA_DIST = malloc.c realloc.c strnlen.c
+EXTRA_DIST = malloc.c realloc.c stdbool_.h strnlen.c
+MOSTLYCLEANFILES = stdbool.h stdbool.h-t
+
+# We need the following in order to create an <stdbool.h> when the system
+# doesn't have one that works.
+$(libbison_a_OBJECTS): $(STDBOOL_H)
+stdbool.h: stdbool_.h
+       sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' <$(srcdir)/stdbool_.h 
>address@hidden
+       mv address@hidden $@
 
 libbison_a_SOURCES = \
   gettext.h \
Index: lib/dirname.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/dirname.c,v
retrieving revision 1.2
diff -p -u -r1.2 dirname.c
--- lib/dirname.c       12 Aug 2002 14:11:02 -0000      1.2
+++ lib/dirname.c       16 Jun 2003 19:34:16 -0000
@@ -1,5 +1,5 @@
 /* dirname.c -- return all but the last element in a path
-   Copyright 1990, 1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1990, 1998, 2000, 2001, 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
@@ -67,9 +67,13 @@ dir_name (char const *path)
 
 Run the test like this (expect no output):
   gcc -DHAVE_CONFIG_H -DTEST_DIRNAME -I.. -O -Wall \
-     basename.c dirname.c xmalloc.c
+     basename.c dirname.c xmalloc.c error.c
   sed -n '/^BEGIN-DATA$/,/^END-DATA$/p' dirname.c|grep -v DATA|./a.out
 
+If it's been built on a DOS or Windows platforms, run another test like
+this (again, expect no output):
+  sed -n '/^BEGIN-DOS-DATA$/,/^END-DOS-DATA$/p' dirname.c|grep -v DATA|./a.out
+
 BEGIN-DATA
 foo//// .
 bar/foo//// bar
@@ -79,15 +83,27 @@ foo/ .
 a .
 END-DATA
 
+BEGIN-DOS-DATA
+c:///// c:/
+c:/ c:/
+c:/. c:/
+c:foo c:.
+c:foo/bar c:foo
+END-DOS-DATA
+
 */
 
 # define MAX_BUFF_LEN 1024
 # include <stdio.h>
 
+char *program_name;
+
 int
-main ()
+main (int argc, char *argv[])
 {
   char buff[MAX_BUFF_LEN + 1];
+
+  program_name = argv[0];
 
   buff[MAX_BUFF_LEN] = 0;
   while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
Index: lib/dirname.h
===================================================================
RCS file: /cvsroot/bison/bison/lib/dirname.h,v
retrieving revision 1.2
diff -p -u -r1.2 dirname.h
--- lib/dirname.h       12 Aug 2002 14:11:02 -0000      1.2
+++ lib/dirname.h       16 Jun 2003 19:34:16 -0000
@@ -17,6 +17,8 @@
 #ifndef DIRNAME_H_
 # define DIRNAME_H_ 1
 
+# include <stddef.h>
+
 # ifndef PARAMS
 #  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
 #   define PARAMS(Args) Args
Index: lib/hash.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/hash.c,v
retrieving revision 1.11
diff -p -u -r1.11 hash.c
--- lib/hash.c  12 Mar 2003 23:08:06 -0000      1.11
+++ lib/hash.c  16 Jun 2003 19:34:17 -0000
@@ -31,6 +31,7 @@
 # include <stdlib.h>
 #endif
 
+#include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 
@@ -403,9 +404,6 @@ hash_do_for_each (const Hash_table *tabl
 unsigned
 hash_string (const char *string, unsigned n_buckets)
 {
-# ifndef CHAR_BIT
-#  define CHAR_BIT 8
-# endif
 # define ROTATE_LEFT(Value, Shift) \
   ((Value) << (Shift) | (Value) >> ((sizeof (unsigned) * CHAR_BIT) - (Shift)))
 # define HASH_ONE_CHAR(Value, Byte) \
Index: lib/hash.h
===================================================================
RCS file: /cvsroot/bison/bison/lib/hash.h,v
retrieving revision 1.8
diff -p -u -r1.8 hash.h
--- lib/hash.h  12 Aug 2002 14:11:02 -0000      1.8
+++ lib/hash.h  16 Jun 2003 19:34:17 -0000
@@ -24,6 +24,8 @@
 #ifndef HASH_H_
 # define HASH_H_
 
+# include <stdio.h>
+
 # ifndef PARAMS
 #  if PROTOTYPES || __STDC__
 #   define PARAMS(Args) Args
Index: lib/malloc.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/malloc.c,v
retrieving revision 1.1
diff -p -u -r1.1 malloc.c
--- lib/malloc.c        2 Feb 2001 14:56:44 -0000       1.1
+++ lib/malloc.c        16 Jun 2003 19:34:17 -0000
@@ -22,7 +22,7 @@
 #endif
 #undef malloc
 
-#include <sys/types.h>
+#include <stddef.h>
 
 char *malloc ();
 
Index: lib/obstack.h
===================================================================
RCS file: /cvsroot/bison/bison/lib/obstack.h,v
retrieving revision 1.7
diff -p -u -r1.7 obstack.h
--- lib/obstack.h       4 Jan 2003 01:37:48 -0000       1.7
+++ lib/obstack.h       16 Jun 2003 19:34:19 -0000
@@ -372,12 +372,12 @@ extern int obstack_exit_failure;
 
 # define obstack_object_size(OBSTACK)                                  \
   __extension__                                                                
\
-  ({ struct obstack *__o = (OBSTACK);                                  \
+  ({ struct obstack const *__o = (OBSTACK);                            \
      (unsigned) (__o->next_free - __o->object_base); })
 
 # define obstack_room(OBSTACK)                                         \
   __extension__                                                                
\
-  ({ struct obstack *__o = (OBSTACK);                                  \
+  ({ struct obstack const *__o = (OBSTACK);                            \
      (unsigned) (__o->chunk_limit - __o->next_free); })
 
 # define obstack_make_room(OBSTACK,length)                             \
@@ -390,7 +390,7 @@ __extension__                                               
                \
 
 # define obstack_empty_p(OBSTACK)                                      \
   __extension__                                                                
\
-  ({ struct obstack *__o = (OBSTACK);                                  \
+  ({ struct obstack const *__o = (OBSTACK);                            \
      (__o->chunk->prev == 0 && __o->next_free - __o->chunk->contents == 0); })
 
 # define obstack_grow(OBSTACK,where,length)                            \
Index: lib/quote.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/quote.c,v
retrieving revision 1.3
diff -p -u -r1.3 quote.c
--- lib/quote.c 3 Jan 2002 09:55:33 -0000       1.3
+++ lib/quote.c 16 Jun 2003 19:34:19 -0000
@@ -1,5 +1,5 @@
 /* quote.c - quote arguments for output
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 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
@@ -21,23 +21,19 @@
 # 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"
 
-/* Return an unambiguous printable representated, allocated in slot N,
-   for NAME, suitable for diagnostics.  */
+/* Return an unambiguous printable representation of NAME,
+   allocated in slot N, suitable for diagnostics.  */
 char const *
 quote_n (int n, char const *name)
 {
   return quotearg_n_style (n, locale_quoting_style, name);
 }
 
-/* Return an unambiguous printable representation of NAME, suitable
-   for diagnostics.  */
+/* Return an unambiguous printable representation of NAME,
+   suitable for diagnostics.  */
 char const *
 quote (char const *name)
 {
Index: lib/realloc.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/realloc.c,v
retrieving revision 1.1
diff -p -u -r1.1 realloc.c
--- lib/realloc.c       2 Feb 2001 14:56:44 -0000       1.1
+++ lib/realloc.c       16 Jun 2003 19:34:19 -0000
@@ -22,7 +22,7 @@
 #endif
 #undef realloc
 
-#include <sys/types.h>
+#include <stddef.h>
 
 char *malloc ();
 char *realloc ();
Index: lib/strcasecmp.c
===================================================================
RCS file: /cvsroot/bison/bison/lib/strcasecmp.c,v
retrieving revision 1.1
diff -p -u -r1.1 strcasecmp.c
--- lib/strcasecmp.c    27 Sep 2002 13:03:32 -0000      1.1
+++ lib/strcasecmp.c    16 Jun 2003 19:34:19 -0000
@@ -29,7 +29,7 @@
 # define LENGTH_LIMIT_EXPR(Expr) 0
 #endif
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <ctype.h>
 
 #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
Index: lib/xalloc.h
===================================================================
RCS file: /cvsroot/bison/bison/lib/xalloc.h,v
retrieving revision 1.4
diff -p -u -r1.4 xalloc.h
--- lib/xalloc.h        25 Aug 2001 13:13:14 -0000      1.4
+++ lib/xalloc.h        16 Jun 2003 19:34:19 -0000
@@ -18,6 +18,8 @@
 #ifndef XALLOC_H_
 # define XALLOC_H_
 
+# include <stddef.h>
+
 # ifndef PARAMS
 #  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
 #   define PARAMS(Args) Args
Index: m4/alloca.m4
===================================================================
RCS file: /cvsroot/bison/bison/m4/alloca.m4,v
retrieving revision 1.1
diff -p -u -r1.1 alloca.m4
--- m4/alloca.m4        12 Mar 2003 23:08:11 -0000      1.1
+++ m4/alloca.m4        16 Jun 2003 19:34:19 -0000
@@ -1,4 +1,4 @@
-# alloca.m4 serial 2
+# alloca.m4 serial 2 (gettext-0.12)
 dnl Copyright (C) 2002-2003 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
Index: m4/onceonly.m4
===================================================================
RCS file: /cvsroot/bison/bison/m4/onceonly.m4,v
retrieving revision 1.2
diff -p -u -r1.2 onceonly.m4
--- m4/onceonly.m4      13 Mar 2003 21:21:13 -0000      1.2
+++ m4/onceonly.m4      16 Jun 2003 19:34:19 -0000
@@ -1,4 +1,4 @@
-# onceonly.m4 serial 2
+# onceonly.m4 serial 3 (gettext-0.12)
 dnl Copyright (C) 2002, 2003 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
@@ -21,20 +21,20 @@ dnl inside an AC_DEFUNed function, the g
 dnl empty, and the check will be inserted before the body of the AC_DEFUNed
 dnl function.
 
-dnl Taken from Autoconf 2.50; can be removed once we assume 2.50 or later.
-define([m4_quote], [[$*]])
+dnl Autoconf version 2.57 or newer is recommended.
+AC_PREREQ(2.54)
 
 # AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
 # AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
 AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
   :
   AC_FOREACH([gl_HEADER_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
-                                                [-./], [___])), [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]),
+                                                 [-./], [___])), [
       AC_CHECK_HEADERS(gl_HEADER_NAME)
     ])
     AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
-                                                  [-./], [___])))
+                                                   [-./], [___])))
   ])
 ])
 
@@ -43,10 +43,10 @@ AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
 AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
   :
   AC_FOREACH([gl_FUNC_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
-      AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
+      AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME]))
     ])
-    AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
   ])
 ])
 
@@ -55,9 +55,9 @@ AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
 AC_DEFUN([AC_CHECK_DECLS_ONCE], [
   :
   AC_FOREACH([gl_DECL_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
-      AC_CHECK_DECLS(defn([gl_DECL_NAME]))
+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
     ])
-    AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
   ])
 ])
Index: m4/quote.m4
===================================================================
RCS file: /cvsroot/bison/bison/m4/quote.m4,v
retrieving revision 1.1
diff -p -u -r1.1 quote.m4
--- m4/quote.m4 12 Mar 2003 23:08:11 -0000      1.1
+++ m4/quote.m4 16 Jun 2003 19:34:19 -0000
@@ -1,5 +1,5 @@
-# quote.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# quote.m4 serial 2
+dnl Copyright (C) 2002, 2003 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
@@ -9,5 +9,5 @@ dnl the same distribution terms as the r
 AC_DEFUN([gl_QUOTE],
 [
   dnl Prerequisites of lib/quote.c.
-  AC_CHECK_HEADERS_ONCE(stddef.h)
+  dnl (none)
 ])