Update.

33 files changed, 247 insertions, 86 deletions

diff --git a/gl/Makefile.am b/gl/Makefile.am
index 7e6e2afc93..e6ada59609 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -8,7 +8,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=. --lgpl --libtool --macro-prefix=gl arpa_inet fdl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gendocs getaddrinfo getline getpass gettext inet_ntop inet_pton maintainer-makefile memmem memmove minmax read-file readline snprintf socklen stdint
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=. --lgpl --libtool --macro-prefix=gl arpa_inet fdl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gendocs getaddrinfo getline getpass gettext inet_ntop inet_pton maintainer-makefile memmem memmove minmax read-file readline snprintf socklen stdint
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
@@ -17,7 +17,6 @@ noinst_LTLIBRARIES = libgnu.la
 libgnu_la_SOURCES =
 libgnu_la_LIBADD = @LTLIBOBJS@
 noinst_HEADERS =
-pkgdata_DATA =
 EXTRA_DIST =
 BUILT_SOURCES =
 SUFFIXES =
@@ -60,6 +59,7 @@ MOSTLYCLEANDIRS += arpa
 
 ## begin gnulib module gc
 
+EXTRA_DIST += gc.h
 if GL_COND_LIBTOOL
 libgnu_la_LIBADD += $(LTLIBGCRYPT)
 else
@@ -68,12 +68,36 @@ endif
 
 ## end   gnulib module gc
 
+## begin gnulib module gc-md5
+
+libgnu_la_SOURCES += md5.h
+
+## end   gnulib module gc-md5
+
 ## begin gnulib module getaddrinfo
 
 libgnu_la_SOURCES += getaddrinfo.h
 
 ## end   gnulib module getaddrinfo
 
+## begin gnulib module getdelim
+
+EXTRA_DIST += getdelim.h
+
+## end   gnulib module getdelim
+
+## begin gnulib module getline
+
+EXTRA_DIST += getline.h
+
+## end   gnulib module getline
+
+## begin gnulib module getpass
+
+EXTRA_DIST += getpass.h
+
+## end   gnulib module getpass
+
 ## begin gnulib module gettext
 
 # This is for those projects which use "gettextize --intl" to put a source-code
@@ -106,6 +130,12 @@ libgnu_la_SOURCES += inet_pton.h
 
 ## end   gnulib module inet_pton
 
+## begin gnulib module md2
+
+EXTRA_DIST += md2.h
+
+## end   gnulib module md2
+
 ## begin gnulib module memmem
 
 libgnu_la_SOURCES += memmem.h
@@ -133,6 +163,18 @@ MOSTLYCLEANDIRS += netinet
 
 ## end   gnulib module netinet_in
 
+## begin gnulib module read-file
+
+EXTRA_DIST += read-file.h
+
+## end   gnulib module read-file
+
+## begin gnulib module readline
+
+EXTRA_DIST += readline.h
+
+## end   gnulib module readline
+
 ## begin gnulib module size_max
 
 libgnu_la_SOURCES += size_max.h
@@ -169,9 +211,10 @@ EXTRA_DIST += stdint_.h
 stdint.h: stdint_.h
 	sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
 	    -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-	    -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
 	    -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
+	    -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
 	    -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
+	    -e 's|@''ABSOLUTE_INTTYPES_H''@|$(ABSOLUTE_INTTYPES_H)|g' \
 	    -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
 	    -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
 	    -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
@@ -194,6 +237,12 @@ MOSTLYCLEANFILES += stdint.h stdint.h-t
 
 ## end   gnulib module stdint
 
+## begin gnulib module strdup
+
+EXTRA_DIST += strdup.h
+
+## end   gnulib module strdup
+
 ## begin gnulib module sys_socket
 
 BUILT_SOURCES += $(SYS_SOCKET_H)
diff --git a/gl/getaddrinfo.c b/gl/getaddrinfo.c
index 7a84003640..35531c51c4 100644
--- a/gl/getaddrinfo.c
+++ b/gl/getaddrinfo.c
@@ -42,6 +42,15 @@
 #include "snprintf.h"
 #include "strdup.h"
 
+/* BeOS has AF_INET, but not PF_INET.  */
+#ifndef PF_INET
+# define PF_INET AF_INET
+#endif
+/* BeOS also lacks PF_UNSPEC.  */
+#ifndef PF_UNSPEC
+# define PF_UNSPEC 0
+#endif
+
 #if defined _WIN32 || defined __WIN32__
 # define WIN32_NATIVE
 #endif
diff --git a/gl/m4/arcfour.m4 b/gl/m4/arcfour.m4
index 17150e616b..905251a777 100644
--- a/gl/m4/arcfour.m4
+++ b/gl/m4/arcfour.m4
@@ -1,11 +1,10 @@
-# arcfour.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# arcfour.m4 serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_ARCFOUR],
 [
-  AC_LIBSOURCES([arcfour.c, arcfour.h])
   AC_LIBOBJ([arcfour])
 ])
diff --git a/gl/m4/arctwo.m4 b/gl/m4/arctwo.m4
index a4dcc62802..7ea189f899 100644
--- a/gl/m4/arctwo.m4
+++ b/gl/m4/arctwo.m4
@@ -1,12 +1,11 @@
-# arctwo.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# arctwo.m4 serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_ARCTWO],
 [
-  AC_LIBSOURCES([arctwo.c, arctwo.h])
   AC_LIBOBJ([arctwo])
   # Prerequisites of lib/arctwo.c.
   AC_REQUIRE([AC_C_INLINE])
diff --git a/gl/m4/codeset.m4 b/gl/m4/codeset.m4
index a6e67ec498..55f50a13d6 100644
--- a/gl/m4/codeset.m4
+++ b/gl/m4/codeset.m4
@@ -1,5 +1,5 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# codeset.m4 serial 2 (gettext-0.15.1)
+dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,7 +10,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
 [
   AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
     [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
+      [char* cs = nl_langinfo(CODESET); return !cs;],
       am_cv_langinfo_codeset=yes,
       am_cv_langinfo_codeset=no)
     ])
diff --git a/gl/m4/des.m4 b/gl/m4/des.m4
index 1a3bd50885..dc71132e33 100644
--- a/gl/m4/des.m4
+++ b/gl/m4/des.m4
@@ -1,11 +1,10 @@
-# des.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# des.m4 serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_DES],
 [
-  AC_LIBSOURCES([des.c, des.h])
   AC_LIBOBJ([des])
 ])
diff --git a/gl/m4/gc-pbkdf2-sha1.m4 b/gl/m4/gc-pbkdf2-sha1.m4
index 674f739677..05fc881c29 100644
--- a/gl/m4/gc-pbkdf2-sha1.m4
+++ b/gl/m4/gc-pbkdf2-sha1.m4
@@ -1,11 +1,10 @@
-# gc-pbkdf2-sha1.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# gc-pbkdf2-sha1.m4 serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_GC_PBKDF2_SHA1],
 [
-  AC_LIBSOURCES([gc-pbkdf2-sha1.c])
   AC_LIBOBJ([gc-pbkdf2-sha1])
 ])
diff --git a/gl/m4/gc.m4 b/gl/m4/gc.m4
index 359b9f12ad..1d6b37919c 100644
--- a/gl/m4/gc.m4
+++ b/gl/m4/gc.m4
@@ -1,4 +1,4 @@
-# gc.m4 serial 3
+# gc.m4 serial 4
 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_GC],
 [
-  AC_LIBSOURCES([gc.h, gc-gnulib.c, gc-libgcrypt.c])
   AC_ARG_WITH(libgcrypt,
     AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]),
     libgcrypt=$withval, libgcrypt=no)
diff --git a/gl/m4/getdelim.m4 b/gl/m4/getdelim.m4
index 340bb7126d..2a738f680a 100644
--- a/gl/m4/getdelim.m4
+++ b/gl/m4/getdelim.m4
@@ -1,6 +1,6 @@
-# getdelim.m4 serial 1
+# getdelim.m4 serial 2
 
-dnl Copyright (C) 2005 Free Software dnl Foundation, Inc.
+dnl Copyright (C) 2005, 2006 Free Software dnl Foundation, Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,6 @@ AC_PREREQ(2.52)
 
 AC_DEFUN([gl_FUNC_GETDELIM],
 [
-  AC_LIBSOURCES([getdelim.c, getdelim.h])
 
   dnl Persuade glibc <stdio.h> to declare getdelim().
   AC_REQUIRE([AC_GNU_SOURCE])
diff --git a/gl/m4/getline.m4 b/gl/m4/getline.m4
index f49c50eed8..5b55c3045b 100644
--- a/gl/m4/getline.m4
+++ b/gl/m4/getline.m4
@@ -1,4 +1,4 @@
-# getline.m4 serial 14
+# getline.m4 serial 15
 
 dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software
 dnl Foundation, Inc.
@@ -15,8 +15,6 @@ dnl have a function by that name in -linet that doesn't have anything
 dnl to do with the function we need.
 AC_DEFUN([gl_FUNC_GETLINE],
 [
-  AC_LIBSOURCES([getline.c, getline.h])
-
   dnl Persuade glibc <stdio.h> to declare getline().
   AC_REQUIRE([AC_GNU_SOURCE])
 
diff --git a/gl/m4/getpass.m4 b/gl/m4/getpass.m4
index 44c24d030a..014c52d14a 100644
--- a/gl/m4/getpass.m4
+++ b/gl/m4/getpass.m4
@@ -1,4 +1,4 @@
-# getpass.m4 serial 8
+# getpass.m4 serial 9
 dnl Copyright (C) 2002-2003, 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,8 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 # Provide a getpass() function if the system doesn't have it.
 AC_DEFUN([gl_FUNC_GETPASS],
 [
-  AC_LIBSOURCES([getpass.c, getpass.h])
-
   AC_REPLACE_FUNCS(getpass)
   AC_CHECK_DECLS_ONCE(getpass)
   if test $ac_cv_func_getpass = no; then
@@ -20,8 +18,6 @@ AC_DEFUN([gl_FUNC_GETPASS],
 # arbitrary length (not just 8 bytes as on HP-UX).
 AC_DEFUN([gl_FUNC_GETPASS_GNU],
 [
-  AC_LIBSOURCES([getpass.c, getpass.h])
-
   AC_CHECK_DECLS_ONCE(getpass)
   dnl TODO: Detect when GNU getpass() is already found in glibc.
   AC_LIBOBJ(getpass)
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index ae68ac6431..1add313930 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -15,9 +15,10 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=. --lgpl --libtool --macro-prefix=gl arpa_inet fdl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gendocs getaddrinfo getline getpass gettext inet_ntop inet_pton maintainer-makefile memmem memmove minmax read-file readline snprintf socklen stdint
+#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=. --lgpl --libtool --macro-prefix=gl arpa_inet fdl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gendocs getaddrinfo getline getpass gettext inet_ntop inet_pton maintainer-makefile memmem memmove minmax read-file readline snprintf socklen stdint
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
+gl_LOCAL_DIR([gl/override])
 gl_MODULES([arpa_inet fdl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 gendocs getaddrinfo getline getpass gettext inet_ntop inet_pton maintainer-makefile memmem memmove minmax read-file readline snprintf socklen stdint])
 gl_AVOID([])
 gl_SOURCE_BASE([gl])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index ddffb12eed..eb1b7cd172 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -23,7 +23,7 @@ AC_DEFUN([gl_EARLY],
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   AC_REQUIRE([AC_PROG_RANLIB])
   AC_REQUIRE([AC_GNU_SOURCE])
-  AC_REQUIRE([gl_LOCK])
+  AC_REQUIRE([gl_LOCK_EARLY])
 ])
 
 # This macro should be invoked from ./configure.in, in the section
diff --git a/gl/m4/hmac-md5.m4 b/gl/m4/hmac-md5.m4
index 71cb9a6e8c..729c6bf827 100644
--- a/gl/m4/hmac-md5.m4
+++ b/gl/m4/hmac-md5.m4
@@ -1,11 +1,10 @@
-# hmac-md5.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# hmac-md5.m4 serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_HMAC_MD5],
 [
-  AC_LIBSOURCES([hmac.h, hmac-md5.c])
   AC_LIBOBJ([hmac-md5])
 ])
diff --git a/gl/m4/hmac-sha1.m4 b/gl/m4/hmac-sha1.m4
index 1e95822f4a..74c936697d 100644
--- a/gl/m4/hmac-sha1.m4
+++ b/gl/m4/hmac-sha1.m4
@@ -1,11 +1,10 @@
-# hmac-sha1.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# hmac-sha1.m4 serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_HMAC_SHA1],
 [
-  AC_LIBSOURCES([hmac.h, hmac-sha1.c])
   AC_LIBOBJ([hmac-sha1])
 ])
diff --git a/gl/m4/intmax_t.m4 b/gl/m4/intmax_t.m4
index 44b16523cc..17c7b0ae88 100644
--- a/gl/m4/intmax_t.m4
+++ b/gl/m4/intmax_t.m4
@@ -1,5 +1,5 @@
-# intmax_t.m4 serial 4
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+# intmax_t.m4 serial 5
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -46,7 +46,7 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T],
 #if HAVE_INTTYPES_H_WITH_UINTMAX
 #include <inttypes.h>
 #endif
-], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+], [intmax_t x = -1; return !x;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
   if test $gt_cv_c_intmax_t = yes; then
     AC_DEFINE(HAVE_INTMAX_T, 1,
       [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
diff --git a/gl/m4/inttypes-pri.m4 b/gl/m4/inttypes-pri.m4
index ef00da7420..6b53d0b6f6 100644
--- a/gl/m4/inttypes-pri.m4
+++ b/gl/m4/inttypes-pri.m4
@@ -1,4 +1,4 @@
-# inttypes-pri.m4 serial 2 (gettext-0.15)
+# inttypes-pri.m4 serial 3 (gettext-0.15.1)
 dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -26,5 +26,9 @@ char *p = PRId32;
   if test "$gt_cv_inttypes_pri_broken" = yes; then
     AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
       [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+    PRI_MACROS_BROKEN=1
+  else
+    PRI_MACROS_BROKEN=0
   fi
+  AC_SUBST([PRI_MACROS_BROKEN])
 ])
diff --git a/gl/m4/inttypes_h.m4 b/gl/m4/inttypes_h.m4
index a5d075d968..edc8ecb2db 100644
--- a/gl/m4/inttypes_h.m4
+++ b/gl/m4/inttypes_h.m4
@@ -1,5 +1,5 @@
-# inttypes_h.m4 serial 6
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+# inttypes_h.m4 serial 7
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
+    [uintmax_t i = (uintmax_t) -1; return !i;],
     gl_cv_header_inttypes_h=yes,
     gl_cv_header_inttypes_h=no)])
   if test $gl_cv_header_inttypes_h = yes; then
diff --git a/gl/m4/lock.m4 b/gl/m4/lock.m4
index d1ea1ca83f..1ab72164f7 100644
--- a/gl/m4/lock.m4
+++ b/gl/m4/lock.m4
@@ -1,5 +1,5 @@
-# lock.m4 serial 2 (gettext-0.15)
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# lock.m4 serial 4 (gettext-0.15.1)
+dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -19,12 +19,12 @@ dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread".
 dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
 dnl multithread-safe programs.
 
-AC_DEFUN([gl_LOCK],
+AC_DEFUN([gl_LOCK_EARLY],
 [
   AC_REQUIRE([gl_LOCK_BODY])
 ])
 
-dnl The guts of gl_LOCK. Needs to be expanded only once.
+dnl The guts of gl_LOCK_EARLY. Needs to be expanded only once.
 
 AC_DEFUN([gl_LOCK_BODY],
 [
@@ -40,7 +40,15 @@ AC_DEFUN([gl_LOCK_BODY],
   AC_ARG_ENABLE(threads,
 AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])
 AC_HELP_STRING([--disable-threads], [build without multithread safety]),
-    gl_use_threads=$enableval, gl_use_threads=yes)
+    [gl_use_threads=$enableval],
+    [case "$host_os" in
+       dnl Disable multithreading by default on OSF/1, because it interferes
+       dnl with fork()/exec(): When msgexec is linked with -lpthread, its child
+       dnl process gets an endless segmentation fault inside execvp().
+       osf*) gl_use_threads=no ;;
+       *)    gl_use_threads=yes ;;
+     esac
+    ])
   gl_threads_api=none
   LIBTHREAD=
   LTLIBTHREAD=
@@ -227,6 +235,11 @@ int x = (int)PTHREAD_MUTEX_RECURSIVE;
   AC_SUBST(LTLIBTHREAD)
   AC_SUBST(LIBMULTITHREAD)
   AC_SUBST(LTLIBMULTITHREAD)
+])
+
+AC_DEFUN([gl_LOCK],
+[
+  AC_REQUIRE([gl_LOCK_EARLY])
   gl_PREREQ_LOCK
 ])
 
diff --git a/gl/m4/longlong.m4 b/gl/m4/longlong.m4
index ea7c485c36..89a47bd195 100644
--- a/gl/m4/longlong.m4
+++ b/gl/m4/longlong.m4
@@ -1,4 +1,4 @@
-# longlong.m4 serial 6
+# longlong.m4 serial 7
 dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -22,8 +22,8 @@ AC_DEFUN([AC_TYPE_LONG_LONG_INT],
 			   ? 1 : -1)];
 	    int i = 63;]],
 	  [[long long int llmax = 9223372036854775807ll;
-	    return (ll << 63 | ll >> 63 | ll < i | ll > i
-		    | llmax / ll | llmax % ll);]])],
+	    return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+		    | (llmax / ll) | (llmax % ll));]])],
        [ac_cv_type_long_long_int=yes],
        [ac_cv_type_long_long_int=no])])
   if test $ac_cv_type_long_long_int = yes; then
diff --git a/gl/m4/md2.m4 b/gl/m4/md2.m4
index 81612c8f3d..03e1ea37c9 100644
--- a/gl/m4/md2.m4
+++ b/gl/m4/md2.m4
@@ -1,11 +1,10 @@
-# md2.m4 serial 1
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# md2.m4 serial 2
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MD2],
 [
-  AC_LIBSOURCES([md2.c, md2.h])
   AC_LIBOBJ([md2])
 ])
diff --git a/gl/m4/md4.m4 b/gl/m4/md4.m4
index 1df2e3e82b..22a7bdee3e 100644
--- a/gl/m4/md4.m4
+++ b/gl/m4/md4.m4
@@ -1,12 +1,11 @@
-# md4.m4 serial 1
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# md4.m4 serial 2
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MD4],
 [
-  AC_LIBSOURCES([md4.c, md4.h])
   AC_LIBOBJ([md4])
 
   dnl Prerequisites of lib/md4.c.
diff --git a/gl/m4/md5.m4 b/gl/m4/md5.m4
index 0c4d86b591..5a1f8755a0 100644
--- a/gl/m4/md5.m4
+++ b/gl/m4/md5.m4
@@ -1,12 +1,11 @@
-# md5.m4 serial 8
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# md5.m4 serial 9
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MD5],
 [
-  AC_LIBSOURCES([md5.c, md5.h])
   AC_LIBOBJ([md5])
 
   dnl Prerequisites of lib/md5.c.
diff --git a/gl/m4/memxor.m4 b/gl/m4/memxor.m4
index bf88a410dc..e14ffbb0f1 100644
--- a/gl/m4/memxor.m4
+++ b/gl/m4/memxor.m4
@@ -1,4 +1,4 @@
-# memxor.m4 serial 2
+# memxor.m4 serial 3
 dnl Copyright (C) 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MEMXOR],
 [
-  AC_LIBSOURCES([memxor.h, memxor.c])
   AC_LIBOBJ([memxor])
   AC_REQUIRE([AC_C_RESTRICT])
 ])
diff --git a/gl/m4/read-file.m4 b/gl/m4/read-file.m4
index 15bcad98b4..8d1b8f3c5f 100644
--- a/gl/m4/read-file.m4
+++ b/gl/m4/read-file.m4
@@ -1,4 +1,4 @@
-# read-file.m4 serial 1
+# read-file.m4 serial 2
 dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_READ_FILE],
 [
-  AC_LIBSOURCES([read-file.c, read-file.h])
   AC_LIBOBJ([read-file])
   gl_PREREQ_READ_FILE
 ])
diff --git a/gl/m4/readline.m4 b/gl/m4/readline.m4
index 58300884da..4c82a7fafe 100644
--- a/gl/m4/readline.m4
+++ b/gl/m4/readline.m4
@@ -1,4 +1,4 @@
-# readline.m4 serial 4
+# readline.m4 serial 5
 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,8 +9,6 @@ dnl Liljeblad.
 
 AC_DEFUN([gl_FUNC_READLINE],
 [
-  AC_LIBSOURCES([readline.c, readline.h])
-
   dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
diff --git a/gl/m4/rijndael.m4 b/gl/m4/rijndael.m4
index ba5c933d0c..f7bb8d37d1 100644
--- a/gl/m4/rijndael.m4
+++ b/gl/m4/rijndael.m4
@@ -1,13 +1,11 @@
-# rijndael.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# rijndael.m4 serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_RIJNDAEL],
 [
-  AC_LIBSOURCES([rijndael-alg-fst.c, rijndael-alg-fst.h])
   AC_LIBOBJ([rijndael-alg-fst])
-  AC_LIBSOURCES([rijndael-api-fst.c, rijndael-api-fst.h])
   AC_LIBOBJ([rijndael-api-fst])
 ])
diff --git a/gl/m4/sha1.m4 b/gl/m4/sha1.m4
index 7b6c21cb83..c6e6184b2c 100644
--- a/gl/m4/sha1.m4
+++ b/gl/m4/sha1.m4
@@ -1,12 +1,11 @@
-# sha1.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# sha1.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_SHA1],
 [
-  AC_LIBSOURCES([sha1.c, sha1.h])
   AC_LIBOBJ([sha1])
 
   dnl Prerequisites of lib/sha1.c.
diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4
index 48748c6139..b48fb9d379 100644
--- a/gl/m4/stdint.m4
+++ b/gl/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 18
+# stdint.m4 serial 19
 dnl Copyright (C) 2001-2002, 2004-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,14 @@ AC_DEFUN([gl_STDINT_H],
   dnl Check for <inttypes.h>.
   dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.
   if test $ac_cv_header_inttypes_h = yes; then
+    gl_ABSOLUTE_HEADER([inttypes.h])
+    ABSOLUTE_INTTYPES_H=\"$gl_cv_absolute_inttypes_h\"
     HAVE_INTTYPES_H=1
   else
+    ABSOLUTE_INTTYPES_H=\"no/such/file/inttypes.h\"
     HAVE_INTTYPES_H=0
   fi
+  AC_SUBST([ABSOLUTE_INTTYPES_H])
   AC_SUBST([HAVE_INTTYPES_H])
 
   dnl Check for <sys/types.h>.
diff --git a/gl/m4/stdint_h.m4 b/gl/m4/stdint_h.m4
index 3355f35aa3..db9a8ac4c2 100644
--- a/gl/m4/stdint_h.m4
+++ b/gl/m4/stdint_h.m4
@@ -1,5 +1,5 @@
-# stdint_h.m4 serial 5
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+# stdint_h.m4 serial 6
+dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_STDINT_H],
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
+    [uintmax_t i = (uintmax_t) -1; return !i;],
     gl_cv_header_stdint_h=yes,
     gl_cv_header_stdint_h=no)])
   if test $gl_cv_header_stdint_h = yes; then
diff --git a/gl/m4/strdup.m4 b/gl/m4/strdup.m4
index 42325ab9ee..f7786e944b 100644
--- a/gl/m4/strdup.m4
+++ b/gl/m4/strdup.m4
@@ -1,13 +1,11 @@
-# strdup.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# strdup.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRDUP],
 [
-  AC_LIBSOURCES([strdup.c, strdup.h])
-
   AC_REPLACE_FUNCS(strdup)
   AC_CHECK_DECLS_ONCE(strdup)
   gl_PREREQ_STRDUP
diff --git a/gl/override/doc/gendocs_template b/gl/override/doc/gendocs_template
new file mode 100755
index 0000000000..c5890f60a5
--- /dev/null
+++ b/gl/override/doc/gendocs_template
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- $Id$ -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
+<title>%%TITLE%% - GNU Project - Free Software Foundation (FSF)</title>
+<meta http-equiv="content-type" content='text/html; charset=utf-8' />
+<link rel="stylesheet" type="text/css" href="/gnu.css" />
+<link rev="made" href="webmasters@gnu.org" />
+</head>
+
+<!-- This document is in XML, and xhtml 1.0 -->
+<!-- Please make sure to properly nest your tags -->
+<!-- and ensure that your final document validates -->
+<!-- consistent with W3C xhtml 1.0 and CSS standards -->
+<!-- See validator.w3.org -->
+
+<body>
+
+<h3>%%TITLE%%</h3>
+
+<address>Free Software Foundation</address>
+<address>last updated %%DATE%%</address>
+<p>
+<a href="/graphics/gnu-head.jpg">
+	<img src="/graphics/gnu-head-sm.jpg"
+	alt=" [image of the head of a GNU] "
+	width="129" height="122" />
+</a>
+<a href="/philosophy/gif.html">(no gifs due to patent problems)</a>
+</p>
+<hr />
+
+<p>This manual (%%PACKAGE%%) is available in the following formats:</p>
+
+<ul>
+  <li><a href="%%PACKAGE%%.html">HTML 
+      (%%HTML_MONO_SIZE%%K characters)</a> - entirely on one web page.</li>
+  <li><a href="html_node/index.html">HTML</a> - with one web page per
+      node.</li>
+  <li><a href="%%PACKAGE%%.html.gz">HTML compressed
+      (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on 
+      one web page.</li>
+  <li><a href="%%PACKAGE%%.html_node.tar.gz">HTML compressed
+      (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file)</a> -
+      with one web page per node.</li>
+  <li><a href="%%PACKAGE%%.info.tar.gz">Info document
+      (%%INFO_TGZ_SIZE%%K characters gzipped tar file)</a>.</li>
+  <li><a href="%%PACKAGE%%.txt">ASCII text
+      (%%ASCII_SIZE%%K characters)</a>.</li>
+  <li><a href="%%PACKAGE%%.txt.gz">ASCII text compressed
+      (%%ASCII_GZ_SIZE%%K gzipped characters)</a>.</li>
+  <li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file
+      (%%DVI_GZ_SIZE%%K characters gzipped)</a>.</li>
+  <li><a href="%%PACKAGE%%.ps.gz">PostScript file
+      (%%PS_GZ_SIZE%%K characters gzipped)</a>.</li>
+  <li><a href="%%PACKAGE%%.pdf">PDF file
+      (%%PDF_SIZE%%K characters)</a>.</li>
+  <li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source
+      (%%TEXI_TGZ_SIZE%%K characters gzipped tar file)</a></li>
+</ul>
+
+<p>There is also an API reference manual:</p>
+
+<ul>
+  <li><a href="../reference/">HTML API Reference Manual (GTK-DOC)</a>.</li>
+  <li><a href="../reference/gnutls.devhelp">DevHelp API Reference Manual (GTK-DOC)</a>.</li>
+</ul>
+
+<p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%%
+script</a>.)</p>
+
+<div class="copyright">
+<p>
+Return to the <a href="/home.html">GNU Project home page</a>.
+</p>
+
+<p>
+Please send FSF &amp; GNU inquiries to 
+<a href="mailto:gnu@gnu.org"><em>gnu@gnu.org</em></a>.
+There are also <a href="/home.html#ContactInfo">other ways to contact</a> 
+the FSF.
+<br />
+Please send broken links and other corrections (or suggestions) to
+<a href="mailto:webmasters@gnu.org"><em>webmasters@gnu.org</em></a>.
+</p>
+
+<p>
+Copyright (C) 2004 Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+<br />
+Verbatim copying and distribution of this entire article is
+permitted in any medium, provided this notice is preserved.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date$ $Author$
+<!-- timestamp end -->
+</p>
+</div>
+
+</body>
+</html>
diff --git a/gl/stdint_.h b/gl/stdint_.h
index 45ebdaecce..a173d4ecfb 100644
--- a/gl/stdint_.h
+++ b/gl/stdint_.h
@@ -62,7 +62,7 @@
   /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
      int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
      <inttypes.h> also defines intptr_t and uintptr_t.  */
-# include <inttypes.h>
+# include @ABSOLUTE_INTTYPES_H@
 #elif @HAVE_SYS_INTTYPES_H@
   /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
      the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.  */