Merge from gnulib.

10 files changed, 33 insertions, 54 deletions

diff --git a/arg-nonnull.h b/arg-nonnull.h
index 226d1a86998..6c2f1e82d06 100644
--- a/arg-nonnull.h
+++ b/arg-nonnull.h
@@ -9,7 +9,7 @@
    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
-   Lesser General Public License for more details.
+   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/>.  */
diff --git a/c++defs.h b/c++defs.h
index d521417069a..b6821a64ac4 100644
--- a/c++defs.h
+++ b/c++defs.h
@@ -9,7 +9,7 @@
    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
-   Lesser General Public License for more details.
+   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/>.  */
diff --git a/configure b/configure
index 40e191eb9ab..461f5c17bf2 100755
--- a/configure
+++ b/configure
@@ -677,7 +677,6 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC
 TIME_H_DEFINES_STRUCT_TIMESPEC
 NEXT_AS_FIRST_DIRECTIVE_TIME_H
 NEXT_TIME_H
-HAVE_RANDOM_H
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H
 NEXT_STDLIB_H
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H
@@ -841,6 +840,7 @@ HAVE_SETENV
 HAVE_RPMATCH
 HAVE_REALPATH
 HAVE_RANDOM_R
+HAVE_RANDOM_H
 HAVE_PTSNAME
 HAVE_MKSTEMPS
 HAVE_MKSTEMP
@@ -13281,6 +13281,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h
   HAVE_MKSTEMP=1;
   HAVE_MKSTEMPS=1;
   HAVE_PTSNAME=1;
+  HAVE_RANDOM_H=1;
   HAVE_RANDOM_R=1;
   HAVE_REALPATH=1;
   HAVE_RPMATCH=1;
@@ -15542,25 +15543,6 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; }
 
 
 
-  for ac_header in random.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "random.h" "ac_cv_header_random_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_random_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_RANDOM_H 1
-_ACEOF
-
-fi
-
-done
-
-  if test $ac_cv_header_random_h = yes; then
-    HAVE_RANDOM_H=1
-  else
-    HAVE_RANDOM_H=0
-  fi
-
 
 
 
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 94d71885d01..1fe8a1872f6 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2011-02-01.10}
+\def\texinfoversion{2011-02-07.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -8360,7 +8360,7 @@ directory should work if nowhere else does.}
   \gdef^^b9{$^1$}
   \gdef^^ba{\ordm}
   %
-  \gdef^^bb{\guilletright}
+  \gdef^^bb{\guillemetright}
   \gdef^^bc{$1\over4$}
   \gdef^^bd{$1\over2$}
   \gdef^^be{$3\over4$}
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 5e170d155e8..f45a086bb1f 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -918,7 +918,8 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''GNULIB_SYSTEM_POSIX''@|$(GNULIB_SYSTEM_POSIX)|g' \
               -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
               -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
-              -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+              < $(srcdir)/stdlib.in.h | \
+          sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
               -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
               -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
               -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
@@ -954,8 +955,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-              < $(srcdir)/stdlib.in.h; \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
         } > $@-t && \
         mv $@-t $@
 
@@ -1080,7 +1080,8 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
               -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
               -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-              -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+          | \
+          sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
               -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
               -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
               -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
diff --git a/lib/gnulib.mk b/lib/gnulib.mk
index ffd175d58c8..0e7263a002b 100644
--- a/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@ -223,7 +223,8 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''GNULIB_SYSTEM_POSIX''@|$(GNULIB_SYSTEM_POSIX)|g' \
               -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
               -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
-              -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+              < $(srcdir)/stdlib.in.h | \
+          sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
               -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
               -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
               -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
@@ -259,8 +260,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-              < $(srcdir)/stdlib.in.h; \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
         } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
@@ -421,7 +421,8 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
               -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
               -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
               -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-              -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
+          | \
+          sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
               -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
               -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
               -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index b3bb9d4e5de..6e69a277af0 100644
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -49,20 +49,23 @@
 # include <sys/loadavg.h>
 #endif
 
+#if @GNULIB_RANDOM_R@
+
 /* OSF/1 5.1 declares 'struct random_data' in <random.h>, which is included
-   from <stdlib.h> if _REENTRANT is defined.  Include it always.  */
-#if @HAVE_RANDOM_H@
-# include <random.h>
-#endif
+   from <stdlib.h> if _REENTRANT is defined.  Include it whenever we need
+   'struct random_data'.  */
+# if @HAVE_RANDOM_H@
+#  include <random.h>
+# endif
 
-#if !@HAVE_STRUCT_RANDOM_DATA@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@)
-# include <stdint.h>
-#endif
+# if !@HAVE_STRUCT_RANDOM_DATA@ || !@HAVE_RANDOM_R@
+#  include <stdint.h>
+# endif
 
-#if !@HAVE_STRUCT_RANDOM_DATA@
+# if !@HAVE_STRUCT_RANDOM_DATA@
 /* Define 'struct random_data'.
    But allow multiple gnulib generated <stdlib.h> replacements to coexist.  */
-# if !GNULIB_defined_struct_random_data
+#  if !GNULIB_defined_struct_random_data
 struct random_data
 {
   int32_t *fptr;                /* Front pointer.  */
@@ -73,7 +76,8 @@ struct random_data
   int rand_sep;                 /* Distance between front and rear.  */
   int32_t *end_ptr;             /* Pointer behind state table.  */
 };
-#  define GNULIB_defined_struct_random_data 1
+#   define GNULIB_defined_struct_random_data 1
+#  endif
 # endif
 #endif
 
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 28eb1a0e537..d28b552e905 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 35
+# stdlib_h.m4 serial 36
 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,13 +8,6 @@ AC_DEFUN([gl_STDLIB_H],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   gl_NEXT_HEADERS([stdlib.h])
-  AC_CHECK_HEADERS([random.h], [], [], [AC_INCLUDES_DEFAULT])
-  if test $ac_cv_header_random_h = yes; then
-    HAVE_RANDOM_H=1
-  else
-    HAVE_RANDOM_H=0
-  fi
-  AC_SUBST([HAVE_RANDOM_H])
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use, and which is not
@@ -82,6 +75,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_MKSTEMP=1;            AC_SUBST([HAVE_MKSTEMP])
   HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
   HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
+  HAVE_RANDOM_H=1;           AC_SUBST([HAVE_RANDOM_H])
   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
   HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
   HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
diff --git a/src/config.in b/src/config.in
index 20d5d165d7b..68cd4b39ac0 100644
--- a/src/config.in
+++ b/src/config.in
@@ -561,9 +561,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `random' function. */
 #undef HAVE_RANDOM
 
-/* Define to 1 if you have the <random.h> header file. */
-#undef HAVE_RANDOM_H
-
 /* Define to 1 if you have the `recvfrom' function. */
 #undef HAVE_RECVFROM
 
diff --git a/warn-on-use.h b/warn-on-use.h
index fdf250e9f40..2cdeec3e663 100644
--- a/warn-on-use.h
+++ b/warn-on-use.h
@@ -9,7 +9,7 @@
    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
-   Lesser General Public License for more details.
+   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/>.  */