Update gnulib files.

16 files changed, 146 insertions, 79 deletions

diff --git a/build-aux/GNUmakefile b/build-aux/GNUmakefile
index c9fad2d371..35c8869de5 100644
--- a/build-aux/GNUmakefile
+++ b/build-aux/GNUmakefile
@@ -4,21 +4,20 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006, 2007 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 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 3 of the License,
+# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Systems where /bin/sh is not the default shell need this.  The $(shell)
 # command below won't work with e.g. stock DOS/Windows shells.
diff --git a/build-aux/maint.mk b/build-aux/maint.mk
index ddae7e89e1..a7a5a28f87 100644
--- a/build-aux/maint.mk
+++ b/build-aux/maint.mk
@@ -2,22 +2,20 @@
 # This Makefile fragment is intended to be useful by any GNU-like project.
 # This file originate from coreutils, CPPI, Bison, and Autoconf.
 
-## Copyright (C) 2001-2007 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., 51 Franklin Street, Fifth Floor, Boston, MA
-## 02110-1301, USA.
+# Copyright (C) 2001-2007 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 3 of the License,
+# 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, see <http://www.gnu.org/licenses/>.
 
 ME := maint.mk
 
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 9c6d9afe3f..7b93651f1f 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -1,10 +1,9 @@
-
-@node GNU Free Documentation License
-@appendixsec GNU Free Documentation License
-
-@cindex FDL, GNU Free Documentation License
+@c The GNU Free Documentation License.
 @center Version 1.2, November 2002
 
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.  
+
 @display
 Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
@@ -427,7 +426,7 @@ license notices just after the title page:
 @end smallexample
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with...Texts.'' line with this:
+replace the ``with@dots{}Texts.'' line with this:
 
 @smallexample
 @group
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index 05a9a3f9e3..35fd685d7a 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -3718,8 +3718,25 @@ is summarized in the following diagram.
 * GNU GPL::                      License for copying GNUTLS extra and tools.
 @end menu
 
+@node GNU Free Documentation License
+@appendixsec GNU Free Documentation License
+
+@cindex FDL, GNU Free Documentation License
+
 @include fdl.texi
+
+@node GNU LGPL
+@appendixsec GNU Lesser General Public License
+@cindex LGPL, GNU Lesser General Public License
+@cindex License, GNU LGPL
+
 @include lgpl-2.1.texi
+
+@node GNU GPL
+@appendixsec GNU General Public License
+@cindex GPL, GNU General Public License
+@cindex License, GNU GPL
+
 @include gpl-2.0.texi
 
 @node Concept Index
diff --git a/doc/gpl-2.0.texi b/doc/gpl-2.0.texi
index ee61000911..8391c387fe 100644
--- a/doc/gpl-2.0.texi
+++ b/doc/gpl-2.0.texi
@@ -1,10 +1,8 @@
-@node GNU GPL
-@appendixsec GNU General Public License
-@cindex GPL, GNU General Public License
-@cindex License, GNU GPL
+@c The GNU General Public License.
 @center Version 2, June 1991
 
-@c This file is intended to be included in another file.
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.  
 
 @display
 Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc.
diff --git a/doc/lgpl-2.1.texi b/doc/lgpl-2.1.texi
index aa21c8dbf2..260c0ce089 100644
--- a/doc/lgpl-2.1.texi
+++ b/doc/lgpl-2.1.texi
@@ -1,9 +1,9 @@
-@node GNU LGPL
-@appendixsec GNU Lesser General Public License
-@cindex LGPL, GNU Lesser General Public License
-@cindex License, GNU LGPL
+@c The GNU Lesser General Public License.
 @center Version 2.1, February 1999
 
+@c This file is intended to be included within another document,
+@c hence no sectioning command or @node.  
+
 @display
 Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/gl/error.c b/gl/error.c
index cf86343320..9cf67ff904 100644
--- a/gl/error.c
+++ b/gl/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007 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
@@ -31,6 +31,7 @@
 
 #if !_LIBC && ENABLE_NLS
 # include "gettext.h"
+# define _(msgid) gettext (msgid)
 #endif
 
 #ifdef _LIBC
diff --git a/gl/gnulib.mk b/gl/gnulib.mk
index 24cf284537..147965707b 100644
--- a/gl/gnulib.mk
+++ b/gl/gnulib.mk
@@ -49,6 +49,13 @@ EXTRA_libgnu_la_SOURCES += error.c
 
 ## end   gnulib module error
 
+## begin gnulib module gendocs
+
+
+EXTRA_DIST += $(top_srcdir)/build-aux/gendocs.sh
+
+## end   gnulib module gendocs
+
 ## begin gnulib module getaddrinfo
 
 
@@ -82,6 +89,13 @@ libgnu_la_SOURCES += gettext.h
 
 ## end   gnulib module gettext-h
 
+## begin gnulib module havelib
+
+
+EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
+
+## end   gnulib module havelib
+
 ## begin gnulib module inet_ntop
 
 
@@ -104,8 +118,16 @@ EXTRA_libgnu_la_SOURCES += inet_pton.c
 
 LINK_WARNING_H=$(top_srcdir)/build-aux/link-warning.h
 
+EXTRA_DIST += $(top_srcdir)/build-aux/link-warning.h
+
 ## end   gnulib module link-warning
 
+## begin gnulib module maintainer-makefile
+
+EXTRA_DIST += $(top_srcdir)/build-aux/GNUmakefile $(top_srcdir)/build-aux/maint.mk
+
+## end   gnulib module maintainer-makefile
+
 ## begin gnulib module netinet_in
 
 BUILT_SOURCES += $(NETINET_IN_H)
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 928df4471e..5d0831b692 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -23,9 +23,11 @@ gl_MODULES([arpa_inet error fdl gendocs getaddrinfo getline gpl-2.0 inet_ntop in
 gl_AVOID([snprintf vasnprintf])
 gl_SOURCE_BASE([gl])
 gl_M4_BASE([gl/m4])
+gl_PO_BASE([])
 gl_DOC_BASE([doc])
 gl_TESTS_BASE([gl/tests])
 gl_LIB([libgnu])
 gl_MAKEFILE_NAME([gnulib.mk])
 gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
+gl_PO_DOMAIN([])
diff --git a/gl/m4/include_next.m4 b/gl/m4/include_next.m4
index 4dc84c958c..7ce472bc0a 100644
--- a/gl/m4/include_next.m4
+++ b/gl/m4/include_next.m4
@@ -1,4 +1,4 @@
-# include_next.m4 serial 3
+# include_next.m4 serial 4
 dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,9 +11,31 @@ AC_DEFUN([gl_INCLUDE_NEXT],
   AC_LANG_PREPROC_REQUIRE()
   AC_CACHE_CHECK([whether the preprocessor supports include_next],
     [gl_cv_have_include_next],
-    [AC_PREPROC_IFELSE([#include_next <stddef.h>],
+    [rm -rf conftestd1 conftestd2
+     mkdir conftestd1 conftestd2
+     cat <<EOF > conftestd1/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd2/conftest.h
+#ifndef DEFINED_IN_CONFTESTD1
+#error "include_next test doesn't work"
+#endif
+#define DEFINED_IN_CONFTESTD2
+EOF
+     save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2"
+     AC_COMPILE_IFELSE([#include <conftest.h>],
        [gl_cv_have_include_next=yes],
-       [gl_cv_have_include_next=no])])
+       [gl_cv_have_include_next=no])
+     CPPFLAGS="$save_CPPFLAGS"
+     rm -rf conftestd1 conftestd2
+    ])
   if test $gl_cv_have_include_next = yes; then
 
     dnl FIXME: Remove HAVE_INCLUDE_NEXT and update everything that uses it
diff --git a/gl/override/doc/gpl-2.0.texi.diff b/gl/override/doc/gpl-2.0.texi.diff
deleted file mode 100644
index 5e52212631..0000000000
--- a/gl/override/doc/gpl-2.0.texi.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: gpl.texi
-===================================================================
-RCS file: /sources/gnulib/gnulib/doc/gpl.texi,v
-retrieving revision 1.6
-diff -u -p -r1.6 gpl.texi
---- gpl.texi	17 Sep 2006 22:00:25 -0000	1.6
-+++ gpl.texi	21 Sep 2006 13:24:46 -0000
-@@ -1,6 +1,7 @@
--@node Copying
--@unnumbered GNU General Public License
-+@node GNU GPL
-+@appendixsec GNU General Public License
- @cindex GPL, GNU General Public License
-+@cindex License, GNU GPL
- @center Version 2, June 1991
- 
- @c This file is intended to be included in another file.
diff --git a/gl/override/doc/lgpl-2.1.texi.diff b/gl/override/doc/lgpl-2.1.texi.diff
deleted file mode 100644
index cba9ee7eaf..0000000000
--- a/gl/override/doc/lgpl-2.1.texi.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: lgpl.texi
-===================================================================
-RCS file: /sources/gnulib/gnulib/doc/lgpl.texi,v
-retrieving revision 1.5
-diff -u -p -r1.5 lgpl.texi
---- lgpl.texi	16 Sep 2006 14:04:29 -0000	1.5
-+++ lgpl.texi	21 Sep 2006 13:24:56 -0000
-@@ -1,6 +1,7 @@
- @node GNU LGPL
- @appendixsec GNU Lesser General Public License
- @cindex LGPL, GNU Lesser General Public License
-+@cindex License, GNU LGPL
- @center Version 2.1, February 1999
- 
- @display
diff --git a/lgl/Makefile.am b/lgl/Makefile.am
index a143df0719..5e848a0a79 100644
--- a/lgl/Makefile.am
+++ b/lgl/Makefile.am
@@ -232,6 +232,8 @@ EXTRA_liblgnu_la_SOURCES += getpass.c
 # "gettextize --intl".
 AM_CPPFLAGS += -I$(top_builddir)/intl
 
+EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
+
 ## end   gnulib module gettext
 
 ## begin gnulib module gettext-h
@@ -240,10 +242,19 @@ liblgnu_la_SOURCES += gettext.h
 
 ## end   gnulib module gettext-h
 
+## begin gnulib module havelib
+
+
+EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
+
+## end   gnulib module havelib
+
 ## begin gnulib module link-warning
 
 LINK_WARNING_H=$(top_srcdir)/build-aux/link-warning.h
 
+EXTRA_DIST += $(top_srcdir)/build-aux/link-warning.h
+
 ## end   gnulib module link-warning
 
 ## begin gnulib module lseek
diff --git a/lgl/m4/gnulib-cache.m4 b/lgl/m4/gnulib-cache.m4
index 8ec811a26f..7b91411d1b 100644
--- a/lgl/m4/gnulib-cache.m4
+++ b/lgl/m4/gnulib-cache.m4
@@ -23,6 +23,7 @@ gl_MODULES([crypto/gc crypto/gc-arcfour crypto/gc-arctwo crypto/gc-des crypto/gc
 gl_AVOID([])
 gl_SOURCE_BASE([lgl])
 gl_M4_BASE([lgl/m4])
+gl_PO_BASE([])
 gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests])
 gl_LIB([liblgnu])
@@ -30,3 +31,4 @@ gl_LGPL
 gl_MAKEFILE_NAME([])
 gl_LIBTOOL
 gl_MACRO_PREFIX([lgl])
+gl_PO_DOMAIN([])
diff --git a/lgl/m4/include_next.m4 b/lgl/m4/include_next.m4
index 4dc84c958c..7ce472bc0a 100644
--- a/lgl/m4/include_next.m4
+++ b/lgl/m4/include_next.m4
@@ -1,4 +1,4 @@
-# include_next.m4 serial 3
+# include_next.m4 serial 4
 dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,9 +11,31 @@ AC_DEFUN([gl_INCLUDE_NEXT],
   AC_LANG_PREPROC_REQUIRE()
   AC_CACHE_CHECK([whether the preprocessor supports include_next],
     [gl_cv_have_include_next],
-    [AC_PREPROC_IFELSE([#include_next <stddef.h>],
+    [rm -rf conftestd1 conftestd2
+     mkdir conftestd1 conftestd2
+     cat <<EOF > conftestd1/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd2/conftest.h
+#ifndef DEFINED_IN_CONFTESTD1
+#error "include_next test doesn't work"
+#endif
+#define DEFINED_IN_CONFTESTD2
+EOF
+     save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2"
+     AC_COMPILE_IFELSE([#include <conftest.h>],
        [gl_cv_have_include_next=yes],
-       [gl_cv_have_include_next=no])])
+       [gl_cv_have_include_next=no])
+     CPPFLAGS="$save_CPPFLAGS"
+     rm -rf conftestd1 conftestd2
+    ])
   if test $gl_cv_have_include_next = yes; then
 
     dnl FIXME: Remove HAVE_INCLUDE_NEXT and update everything that uses it
diff --git a/lgl/m4/stdint.m4 b/lgl/m4/stdint.m4
index e8016bdd7e..03bb093202 100644
--- a/lgl/m4/stdint.m4
+++ b/lgl/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 27
+# stdint.m4 serial 28
 dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -59,12 +59,18 @@ AC_DEFUN([gl_STDINT_H],
       [gl_cv_header_working_stdint_h],
       [gl_cv_header_working_stdint_h=no
        AC_COMPILE_IFELSE([
-         AC_LANG_PROGRAM([gl_STDINT_INCLUDES
-         [
+         AC_LANG_PROGRAM([[
 #define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
 #define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
+]
+gl_STDINT_INCLUDES
+[
 #ifdef INT8_MAX
 int8_t a1 = INT8_MAX;
 int8_t a1min = INT8_MIN;