Update gnulib files.

6 files changed, 51 insertions, 36 deletions

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