cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Cvs-cvs] ccvs ./ChangeLog ./Makefile.in ./aclocal.m4 ./c...


From: Mark D. Baushke
Subject: [Cvs-cvs] ccvs ./ChangeLog ./Makefile.in ./aclocal.m4 ./c...
Date: Mon, 20 Mar 2006 02:22:01 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/03/20 02:21:57

Modified files:
        .              : ChangeLog Makefile.in aclocal.m4 config.h.in 
                         configure 
        contrib        : ChangeLog Makefile.in 
        contrib/pam    : ChangeLog Makefile.in 
        diff           : ChangeLog Makefile.in 
        doc            : ChangeLog Makefile.in stamp-vti version.texi 
        doc/i18n       : Makefile.in 
        doc/i18n/pt_BR : Makefile.in 
        lib            : ChangeLog Makefile.gnulib Makefile.in 
                         closeout.c fnmatch.c fnmatch_loop.c 
                         gai_strerror.c getaddrinfo.h getcwd.c 
                         getlogin_r.c getlogin_r.h glob.c lstat.c 
                         openat.h pagealign_alloc.c regex.h setenv.c 
                         socket_.h time_r.c time_r.h unsetenv.c 
                         xalloc-die.c 
        m4             : ChangeLog clock_time.m4 extensions.m4 
                         getaddrinfo.m4 gnulib-comp.m4 nanosleep.m4 
                         regex.m4 socklen.m4 sys_socket_h.m4 timespec.m4 
        maint-aux      : Makefile.in 
        man            : Makefile.in 
        src            : ChangeLog Makefile.in 
        tools          : ChangeLog Makefile.in 
        vms            : ChangeLog Makefile.in 
        windows-NT     : ChangeLog Makefile.in config.h config.h.in 
                         stamp-chi 
        windows-NT/SCC : ChangeLog Makefile.in 
Added files:
        m4             : unistd_h.m4 

Log message:
        * lib/closeout.c, lib/fnmatch.c, lib/fnmatch_loop.c,
        lib/gai_strerror.c, lib/getaddrinfo.h, lib/getcwd.c, lib/getlogin_r.c,
        lib/getlogin_r.h, lib/glob.c, lib/lstat.c, lib/openat.h,
        lib/pagealign_alloc.c, lib/regex.h, lib/setenv.c, lib/socket_.h,
        lib/time_r.c, lib/time_r.h, lib/unsetenv.c, lib/xalloc-die.c: Update
        from GNULIB.
        
        * m4/clock_time.m4, m4/extensions.m4, m4/getaddrinfo.m4,
        m4/gnulib-comp.m4, m4/nanosleep.m4, m4/regex.m4, m4/socklen.m4,
        m4/sys_socket_h.m4, m4/timespec.m4, m4/unistd_h.m4: Update from
        GNULIB.
        
        * Makefile.in, aclocal.m4, config.h.in, configure: Regenerated.
        * contrib/Makefile.in: Ditto.
        * contrib/pam/Makefile.in: Ditto.
        * diff/Makefile.in: Ditto.
        * doc/Makefile.in, doc/stamp-vti, doc/version.texi: Ditto.
        * doc/i18n/Makefile.in: Ditto.
        * doc/i18n/pt_BR/Makefile.in: Ditto.
        * lib/Makefile.gnulib, lib/Makefile.in: Ditto.
        * maint-aux/Makefile.in: Ditto.
        * man/Makefile.in: Ditto.
        * src/Makefile.in: Ditto.
        * tools/Makefile.in: Ditto.
        * vms/Makefile.in: Ditto.
        * windows-NT/Makefile.in, windows-NT/Makefile.in,
        windows-NT/config.h.in, windows-NT/stamp-chi: Ditto.
        * windows-NT/SCC/Makefile.in: Ditto.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1278&tr2=1.1279&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/Makefile.in.diff?tr1=1.183&tr2=1.184&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/aclocal.m4.diff?tr1=1.149&tr2=1.150&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/config.h.in.diff?tr1=1.193&tr2=1.194&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.diff?tr1=1.433&tr2=1.434&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/contrib/ChangeLog.diff?tr1=1.178&tr2=1.179&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/contrib/Makefile.in.diff?tr1=1.122&tr2=1.123&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/contrib/pam/ChangeLog.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/contrib/pam/Makefile.in.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/diff/ChangeLog.diff?tr1=1.116&tr2=1.117&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/diff/Makefile.in.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?tr1=1.947&tr2=1.948&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/Makefile.in.diff?tr1=1.138&tr2=1.139&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-vti.diff?tr1=1.173&tr2=1.174&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version.texi.diff?tr1=1.174&tr2=1.175&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/i18n/Makefile.in.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/i18n/pt_BR/Makefile.in.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/ChangeLog.diff?tr1=1.491&tr2=1.492&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/Makefile.gnulib.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/Makefile.in.diff?tr1=1.202&tr2=1.203&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/closeout.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/fnmatch.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/fnmatch_loop.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/gai_strerror.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/getaddrinfo.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/getcwd.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/getlogin_r.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/getlogin_r.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/glob.c.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/lstat.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/openat.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/pagealign_alloc.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/regex.h.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/setenv.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/socket_.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/time_r.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/time_r.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/unsetenv.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/xalloc-die.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/ChangeLog.diff?tr1=1.157&tr2=1.158&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/clock_time.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/extensions.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/getaddrinfo.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/gnulib-comp.m4.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/nanosleep.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/regex.m4.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/socklen.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/sys_socket_h.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/timespec.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/unistd_h.m4?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/maint-aux/Makefile.in.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/man/Makefile.in.diff?tr1=1.93&tr2=1.94&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3358&tr2=1.3359&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/Makefile.in.diff?tr1=1.164&tr2=1.165&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/tools/ChangeLog.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/tools/Makefile.in.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/vms/ChangeLog.diff?tr1=1.106&tr2=1.107&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/vms/Makefile.in.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/windows-NT/ChangeLog.diff?tr1=1.348&tr2=1.349&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/windows-NT/Makefile.in.diff?tr1=1.115&tr2=1.116&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/windows-NT/config.h.diff?tr1=1.175&tr2=1.176&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/windows-NT/config.h.in.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/windows-NT/stamp-chi.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/windows-NT/SCC/ChangeLog.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/windows-NT/SCC/Makefile.in.diff?tr1=1.77&tr2=1.78&r1=text&r2=text

Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1278 ccvs/ChangeLog:1.1279
--- ccvs/ChangeLog:1.1278       Fri Mar 10 16:29:34 2006
+++ ccvs/ChangeLog      Mon Mar 20 02:21:54 2006
@@ -1,3 +1,7 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in, aclocal.m4, config.h.in, configure: Regenerated.
+
 2006-03-07  Derek Price  <address@hidden>
 
        * NEWS: Note rtag fixes.
Index: ccvs/Makefile.in
diff -u ccvs/Makefile.in:1.183 ccvs/Makefile.in:1.184
--- ccvs/Makefile.in:1.183      Wed Jan 25 12:53:54 2006
+++ ccvs/Makefile.in    Mon Mar 20 02:21:55 2006
@@ -123,12 +123,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -244,6 +244,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/aclocal.m4
diff -u ccvs/aclocal.m4:1.149 ccvs/aclocal.m4:1.150
--- ccvs/aclocal.m4:1.149       Wed Jan 25 12:53:54 2006
+++ ccvs/aclocal.m4     Mon Mar 20 02:21:55 2006
@@ -1030,6 +1030,7 @@
 m4_include([m4/uintmax_t.m4])
 m4_include([m4/ulonglong.m4])
 m4_include([m4/unistd-safer.m4])
+m4_include([m4/unistd_h.m4])
 m4_include([m4/unlocked-io.m4])
 m4_include([m4/vasnprintf.m4])
 m4_include([m4/vasprintf.m4])
Index: ccvs/config.h.in
diff -u ccvs/config.h.in:1.193 ccvs/config.h.in:1.194
--- ccvs/config.h.in:1.193      Wed Jan 25 12:53:54 2006
+++ ccvs/config.h.in    Mon Mar 20 02:21:55 2006
@@ -520,6 +520,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
Index: ccvs/configure
diff -u ccvs/configure:1.433 ccvs/configure:1.434
--- ccvs/configure:1.433        Fri Jan 27 07:38:52 2006
+++ ccvs/configure      Mon Mar 20 02:21:55 2006
@@ -327,7 +327,7 @@
 
 gl_header_list=
 gl_func_list=
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL 
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP 
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar 
am__untar ac_prefix_program MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 
RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR 
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE 
am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S PERL CSH MKTEMP SENDMAIL 
PR ROFF PS2PDF TEXI2DVI MAKE_TARGETS_IN_VPATH_TRUE MAKE_TARGETS_IN_VPATH_FALSE 
LIBOBJS GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE ALLOCA ALLOCA_H STDBOOL_H 
HAVE__BOOL FNMATCH_H YACC YFLAGS LIB_CLOCK_GETTIME GETOPT_H GLOB_H 
LIB_NANOSLEEP HAVE_LONG_64BIT HAVE_LONG_LONG_64BIT STDINT_H SYS_SOCKET_H 
EOVERFLOW MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build 
build_cpu build_vendor build_os host host_cpu host_vendor host_os 
INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB 
cvs_client_objects KRB4 ZLIB_SUBDIRS ZLIB_CPPFLAGS ZLIB_LIBS with_default_rsh 
RSH_DFLT EDITOR LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME 
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix 
program_transform_name bindir sbindir libexecdir datadir sysconfdir 
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir 
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL 
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP 
INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar 
am__untar ac_prefix_program MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT 
RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR 
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE 
am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S PERL CSH MKTEMP SENDMAIL 
PR ROFF PS2PDF TEXI2DVI MAKE_TARGETS_IN_VPATH_TRUE MAKE_TARGETS_IN_VPATH_FALSE 
LIBOBJS GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE ALLOCA ALLOCA_H SYS_SOCKET_H 
STDBOOL_H HAVE__BOOL FNMATCH_H YACC YFLAGS LIB_CLOCK_GETTIME GETOPT_H GLOB_H 
LIB_NANOSLEEP HAVE_LONG_64BIT HAVE_LONG_LONG_64BIT STDINT_H UNISTD_H EOVERFLOW 
MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu 
build_vendor build_os host host_cpu host_vendor host_os INTL_MACOSX_LIBS 
LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB cvs_client_objects KRB4 
ZLIB_SUBDIRS ZLIB_CPPFLAGS ZLIB_LIBS with_default_rsh RSH_DFLT EDITOR LTLIBOBJS'
 ac_subst_files='MKTEMP_SH_FUNCTION'
 
 # Initialize some variables set by options.
@@ -1467,7 +1467,9 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+gl_header_list="$gl_header_list sys/socket.h"
 gl_header_list="$gl_header_list netinet/in.h"
+gl_header_list="$gl_header_list netdb.h"
 gl_func_list="$gl_func_list fdopendir"
 gl_func_list="$gl_func_list fchdir"
 gl_func_list="$gl_func_list mempcpy"
@@ -1497,12 +1499,9 @@
 gl_func_list="$gl_func_list mbrtowc"
 gl_func_list="$gl_func_list wcrtomb"
 gl_func_list="$gl_func_list wcscoll"
-gl_header_list="$gl_header_list sys/socket.h"
-gl_header_list="$gl_header_list ws2tcpip.h"
 gl_func_list="$gl_func_list mblen"
 gl_func_list="$gl_func_list mbrlen"
 gl_func_list="$gl_func_list tzset"
-gl_header_list="$gl_header_list winsock2.h"
 
 
 
@@ -3935,7 +3934,63 @@
 
 
 
-  cat >>confdefs.h <<\_ACEOF
+  echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" 
>&5
+echo $ECHO_N "checking whether it is safe to define __EXTENSIONS__... $ECHO_C" 
>&6
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+         #define __EXTENSIONS__ 1
+         $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_safe_to_define___extensions__=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+echo "${ECHO_T}$ac_cv_safe_to_define___extensions__" >&6
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
 #define __EXTENSIONS__ 1
 _ACEOF
 
@@ -8894,25 +8949,34 @@
 
   fi
 
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
+
+
+
+
+
+for ac_header in $gl_header_list
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
+$ac_includes_default
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8936,41 +9000,128 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
+  ac_header_compiler=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
 
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, 
rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the 
preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the 
compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be 
compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing 
prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite 
headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf 
documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But 
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be 
Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the 
preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" 
>&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler 
will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take 
precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## --------------------------------- ##
+## Report this to address@hidden ##
+## --------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
+done
 
 
 
-for ac_header in $gl_header_list
+
+
+
+
+
+  :
+
+
+
+
+
+  if test $ac_cv_header_sys_socket_h = yes; then
+    SYS_SOCKET_H=''
+  else
+
+
+for ac_header in winsock2.h ws2tcpip.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -9119,12 +9270,97 @@
 
 done
 
+    SYS_SOCKET_H='sys/socket.h'
+  fi
+
+
+echo "$as_me:$LINENO: checking for inline" >&5
+echo $ECHO_N "checking for inline... $ECHO_C" >&6
+if test "${ac_cv_c_inline+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_inline=$ac_kw; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+echo "${ECHO_T}$ac_cv_c_inline" >&6
+
+
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
+
+
+
+
+
+
 
 
 
 
 
 
+
+
+  { echo "$as_me:$LINENO: checking how to do getaddrinfo" >&5
+echo "$as_me: checking how to do getaddrinfo" >&6;}
+
   echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5
 echo $ECHO_N "checking for library containing getaddrinfo... $ECHO_C" >&6
 if test "${ac_cv_search_getaddrinfo+set}" = set; then
@@ -9251,31 +9487,62 @@
 
 fi
 
-  echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
-echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
-if test "${ac_cv_search_gethostbyname+set}" = set; then
+
+for ac_func in getaddrinfo
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_gethostbyname=no
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares 
$ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
+{
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
 int
 main ()
 {
-gethostbyname ();
+return f != $ac_func;
   ;
   return 0;
 }
@@ -9302,35 +9569,161 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_gethostbyname="none required"
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+eval "$as_ac_var=no"
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_gethostbyname" = no; then
-  for ac_lib in inet nsl; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+
+    echo "$as_me:$LINENO: checking for getaddrinfo in ws2tcpip.h and -lws2_32" 
>&5
+echo $ECHO_N "checking for getaddrinfo in ws2tcpip.h and -lws2_32... $ECHO_C" 
>&6
+if test "${gl_cv_w32_getaddrinfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+      gl_cv_w32_getaddrinfo=no
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -lws2_32"
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
+
+int
+main ()
+{
+getaddrinfo(0, 0, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gl_cv_w32_getaddrinfo=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+    LIBS="$am_save_LIBS"
+fi
+echo "$as_me:$LINENO: result: $gl_cv_w32_getaddrinfo" >&5
+echo "${ECHO_T}$gl_cv_w32_getaddrinfo" >&6
+    if test "$gl_cv_w32_getaddrinfo" = "yes"; then
+      LIBS="$LIBS -lws2_32"
+    else
+      case $LIBOBJS in
+    "getaddrinfo.$ac_objext"   | \
+  *" getaddrinfo.$ac_objext"   | \
+    "getaddrinfo.$ac_objext "* | \
+  *" getaddrinfo.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getaddrinfo.$ac_objext" ;;
+esac
+
+    fi
+
+fi
+done
+
+
+
+for ac_func in gai_strerror
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares 
$ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
+{
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
 int
 main ()
 {
-gethostbyname ();
+return f != $ac_func;
   ;
   return 0;
 }
@@ -9357,33 +9750,44 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_gethostbyname="-l$ac_lib"
-break
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+eval "$as_ac_var=no"
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6
-if test "$ac_cv_search_gethostbyname" != no; then
-  test "$ac_cv_search_gethostbyname" = "none required" || 
LIBS="$ac_cv_search_gethostbyname $LIBS"
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  case $LIBOBJS in
+    "$ac_func.$ac_objext"   | \
+  *" $ac_func.$ac_objext"   | \
+    "$ac_func.$ac_objext "* | \
+  *" $ac_func.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
+esac
 
 fi
+done
 
-  echo "$as_me:$LINENO: checking for library containing getservbyname" >&5
-echo $ECHO_N "checking for library containing getservbyname... $ECHO_C" >&6
-if test "${ac_cv_search_getservbyname+set}" = set; then
+
+
+  echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
+echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
+if test "${ac_cv_search_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_getservbyname=no
+ac_cv_search_gethostbyname=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9397,11 +9801,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char getservbyname ();
+char gethostbyname ();
 int
 main ()
 {
-getservbyname ();
+gethostbyname ();
   ;
   return 0;
 }
@@ -9428,7 +9832,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_getservbyname="none required"
+  ac_cv_search_gethostbyname="none required"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -9436,8 +9840,8 @@
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_getservbyname" = no; then
-  for ac_lib in inet nsl socket xnet; do
+if test "$ac_cv_search_gethostbyname" = no; then
+  for ac_lib in inet nsl; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9452,11 +9856,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char getservbyname ();
+char gethostbyname ();
 int
 main ()
 {
-getservbyname ();
+gethostbyname ();
   ;
   return 0;
 }
@@ -9483,7 +9887,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_getservbyname="-l$ac_lib"
+  ac_cv_search_gethostbyname="-l$ac_lib"
 break
 else
   echo "$as_me: failed program was:" >&5
@@ -9496,70 +9900,38 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_getservbyname" >&5
-echo "${ECHO_T}$ac_cv_search_getservbyname" >&6
-if test "$ac_cv_search_getservbyname" != no; then
-  test "$ac_cv_search_getservbyname" = "none required" || 
LIBS="$ac_cv_search_getservbyname $LIBS"
+echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6
+if test "$ac_cv_search_gethostbyname" != no; then
+  test "$ac_cv_search_gethostbyname" = "none required" || 
LIBS="$ac_cv_search_gethostbyname $LIBS"
 
 fi
 
-
-
-for ac_func in getaddrinfo gai_strerror
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for library containing getservbyname" >&5
+echo $ECHO_N "checking for library containing getservbyname... $ECHO_C" >&6
+if test "${ac_cv_search_getservbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_func_search_save_LIBS=$LIBS
+ac_cv_search_getservbyname=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares 
$ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
 
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
+char getservbyname ();
 int
 main ()
 {
-return f != $ac_func;
+getservbyname ();
   ;
   return 0;
 }
@@ -9586,35 +9958,80 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
+  ac_cv_search_getservbyname="none required"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+if test "$ac_cv_search_getservbyname" = no; then
+  for ac_lib in inet nsl socket xnet; do
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char getservbyname ();
+int
+main ()
+{
+getservbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_search_getservbyname="-l$ac_lib"
+break
 else
-  case $LIBOBJS in
-    "$ac_func.$ac_objext"   | \
-  *" $ac_func.$ac_objext"   | \
-    "$ac_func.$ac_objext "* | \
-  *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
-esac
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-done
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+  done
+fi
+LIBS=$ac_func_search_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_search_getservbyname" >&5
+echo "${ECHO_T}$ac_cv_search_getservbyname" >&6
+if test "$ac_cv_search_getservbyname" != no; then
+  test "$ac_cv_search_getservbyname" = "none required" || 
LIBS="$ac_cv_search_getservbyname $LIBS"
 
+fi
 
 
 
@@ -9628,6 +10045,9 @@
 
 
 
+
+
+
   echo "$as_me:$LINENO: checking whether getaddrinfo is declared" >&5
 echo $ECHO_N "checking whether getaddrinfo is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getaddrinfo+set}" = set; then
@@ -9644,8 +10064,16 @@
      sys/socket.h in i386-unknown-freebsd4.10 and
      powerpc-apple-darwin5.5 required it. */
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
 
 
 int
@@ -9722,8 +10150,16 @@
      sys/socket.h in i386-unknown-freebsd4.10 and
      powerpc-apple-darwin5.5 required it. */
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
 
 
 int
@@ -9800,8 +10236,16 @@
      sys/socket.h in i386-unknown-freebsd4.10 and
      powerpc-apple-darwin5.5 required it. */
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
 
 
 int
@@ -9877,8 +10321,16 @@
 /* end confdefs.h.  */
 
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
 
 
 int
@@ -11385,7 +11837,6 @@
 fi
 
 
-  # dnl Persuade glibc <time.h> to declare these functions.
 
 
   # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function.
@@ -14724,18 +15175,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
   echo "$as_me:$LINENO: checking for inttypes.h" >&5
 echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
 if test "${gt_cv_header_inttypes_h+set}" = set; then
@@ -15123,12 +15562,6 @@
 
 
 
-
-
-
-
-
-
       echo "$as_me:$LINENO: checking whether clearerr_unlocked is declared" >&5
 echo $ECHO_N "checking whether clearerr_unlocked is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_clearerr_unlocked+set}" = set; then
@@ -18855,6 +19288,9 @@
   fi
 
 
+  { echo "$as_me:$LINENO: checking how to do getaddrinfo" >&5
+echo "$as_me: checking how to do getaddrinfo" >&6;}
+
   echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5
 echo $ECHO_N "checking for library containing getaddrinfo... $ECHO_C" >&6
 if test "${ac_cv_search_getaddrinfo+set}" = set; then
@@ -18968,18 +19404,312 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5
-echo "${ECHO_T}$ac_cv_search_getaddrinfo" >&6
-if test "$ac_cv_search_getaddrinfo" != no; then
-  test "$ac_cv_search_getaddrinfo" = "none required" || 
LIBS="$ac_cv_search_getaddrinfo $LIBS"
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+  done
+fi
+LIBS=$ac_func_search_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5
+echo "${ECHO_T}$ac_cv_search_getaddrinfo" >&6
+if test "$ac_cv_search_getaddrinfo" != no; then
+  test "$ac_cv_search_getaddrinfo" = "none required" || 
LIBS="$ac_cv_search_getaddrinfo $LIBS"
+
+fi
+
+
+for ac_func in getaddrinfo
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares 
$ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+
+    echo "$as_me:$LINENO: checking for getaddrinfo in ws2tcpip.h and -lws2_32" 
>&5
+echo $ECHO_N "checking for getaddrinfo in ws2tcpip.h and -lws2_32... $ECHO_C" 
>&6
+if test "${gl_cv_w32_getaddrinfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+      gl_cv_w32_getaddrinfo=no
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -lws2_32"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
+
+int
+main ()
+{
+getaddrinfo(0, 0, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gl_cv_w32_getaddrinfo=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+    LIBS="$am_save_LIBS"
+fi
+echo "$as_me:$LINENO: result: $gl_cv_w32_getaddrinfo" >&5
+echo "${ECHO_T}$gl_cv_w32_getaddrinfo" >&6
+    if test "$gl_cv_w32_getaddrinfo" = "yes"; then
+      LIBS="$LIBS -lws2_32"
+    else
+      case $LIBOBJS in
+    "getaddrinfo.$ac_objext"   | \
+  *" getaddrinfo.$ac_objext"   | \
+    "getaddrinfo.$ac_objext "* | \
+  *" getaddrinfo.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getaddrinfo.$ac_objext" ;;
+esac
+
+    fi
+
+fi
+done
+
+
+
+for ac_func in gai_strerror
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares 
$ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  case $LIBOBJS in
+    "$ac_func.$ac_objext"   | \
+  *" $ac_func.$ac_objext"   | \
+    "$ac_func.$ac_objext "* | \
+  *" $ac_func.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
+esac
+
+fi
+done
+
 
-fi
 
   echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
 echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
@@ -19235,124 +19965,14 @@
 
 
 
-for ac_func in getaddrinfo gai_strerror
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares 
$ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"
-                        || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-        { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  case $LIBOBJS in
-    "$ac_func.$ac_objext"   | \
-  *" $ac_func.$ac_objext"   | \
-    "$ac_func.$ac_objext "* | \
-  *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
-esac
-
-fi
-done
-
 
 
 
 
+  :
 
 
 
-  :
 
 
 
@@ -19374,8 +19994,16 @@
      sys/socket.h in i386-unknown-freebsd4.10 and
      powerpc-apple-darwin5.5 required it. */
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
 
 
 int
@@ -19452,8 +20080,16 @@
      sys/socket.h in i386-unknown-freebsd4.10 and
      powerpc-apple-darwin5.5 required it. */
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
 
 
 int
@@ -19530,8 +20166,16 @@
      sys/socket.h in i386-unknown-freebsd4.10 and
      powerpc-apple-darwin5.5 required it. */
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
 
 
 int
@@ -19607,8 +20251,16 @@
 /* end confdefs.h.  */
 
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
 
 
 int
@@ -23524,6 +24176,8 @@
 
 
 
+
+
   :
 
 
@@ -24328,78 +24982,6 @@
 
 
 
-  echo "$as_me:$LINENO: checking whether off_t can be used in a switch 
statement" >&5
-echo $ECHO_N "checking whether off_t can be used in a switch statement... 
$ECHO_C" >&6
-if test "${gl_cv_type_off_t_switch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-off_t o = -1;
-          switch (o)
-            {
-            case -2:
-              return 1;
-            case -1:
-              return 2;
-            default:
-              return 0;
-            }
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"
-                        || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-        { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gl_cv_type_off_t_switch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gl_cv_type_off_t_switch=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gl_cv_type_off_t_switch" >&5
-echo "${ECHO_T}$gl_cv_type_off_t_switch" >&6
-  if test $gl_cv_type_off_t_switch = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define _REGEX_LARGE_OFFSETS 1
-_ACEOF
-
-  fi
-
-
 
 
 # Check whether --with-included-regex or --without-included-regex was given.
@@ -24495,10 +25077,10 @@
              exit (1);
 
            /* Reject hosts whose regoff_t values are too narrow.
-              These include glibc 2.3.5 on hosts with 64-bit off_t
-              and 32-bit int, and Solaris 10 on hosts with 32-bit int
-              and _FILE_OFFSET_BITS=64.  */
-           if (sizeof (regoff_t) < sizeof (off_t))
+              These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t
+              and 32-bit int.  */
+           if (sizeof (regoff_t) < sizeof (ptrdiff_t)
+               || sizeof (regoff_t) < sizeof (ssize_t))
              exit (1);
 
            exit (0);
@@ -24542,6 +25124,11 @@
   if test $ac_use_included_regex = yes; then
 
 cat >>confdefs.h <<\_ACEOF
+#define _REGEX_LARGE_OFFSETS 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
 #define re_syntax_options rpl_re_syntax_options
 _ACEOF
 
@@ -26896,17 +27483,7 @@
 
   fi
 
-
-  :
-
-
-
-
-
-
-
-
-   echo "$as_me:$LINENO: checking for socklen_t" >&5
+     echo "$as_me:$LINENO: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26920,8 +27497,7 @@
 #include <sys/types.h>
       #if HAVE_SYS_SOCKET_H
       # include <sys/socket.h>
-      #endif
-      #if HAVE_WS2TCPIP_H
+      #elif HAVE_WS2TCPIP_H
       # include <ws2tcpip.h>
       #endif
 
@@ -26978,9 +27554,9 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Systems have either "struct sockaddr *" or
-         # "void *" as the second argument to getpeername
-         gl_cv_socklen_t_equiv=
-         for arg2 in "struct sockaddr" void; do
+        # "void *" as the second argument to getpeername
+        gl_cv_socklen_t_equiv=
+        for arg2 in "struct sockaddr" void; do
           for t in int size_t "unsigned int" "long int" "unsigned long int"; do
             cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -26989,7 +27565,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-                #include <sys/socket.h>
+               #include <sys/socket.h>
 
                int getpeername (int, $arg2 *, $t *);
 int
@@ -27030,10 +27606,10 @@
 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-             test "$gl_cv_socklen_t_equiv" != "" && break
+            test "$gl_cv_socklen_t_equiv" != "" && break
           done
-           test "$gl_cv_socklen_t_equiv" != "" && break
-         done
+          test "$gl_cv_socklen_t_equiv" != "" && break
+        done
 
 fi
 
@@ -28301,14 +28877,155 @@
     SYS_SOCKET_H=''
   else
 
-  :
 
+for ac_header in winsock2.h ws2tcpip.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, 
rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the 
preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the 
compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be 
compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing 
prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite 
headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf 
documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But 
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be 
Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the 
preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" 
>&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler 
will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take 
precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## --------------------------------- ##
+## Report this to address@hidden ##
+## --------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
+done
 
     SYS_SOCKET_H='sys/socket.h'
   fi
@@ -28685,6 +29402,165 @@
 
 
 
+for ac_header in unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, 
rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the 
preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the 
compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be 
compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing 
prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite 
headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf 
documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But 
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be 
Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the 
preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" 
>&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler 
will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take 
precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## --------------------------------- ##
+## Report this to address@hidden ##
+## --------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+    UNISTD_H=''
+
+else
+
+    UNISTD_H='unistd.h'
+
+fi
+
+done
+
+
+
+
+
   case $LIBOBJS in
     "dup-safer.$ac_objext"   | \
   *" dup-safer.$ac_objext"   | \
@@ -44191,6 +45067,7 @@
 s,@GL_COND_LIBTOOL_FALSE@,$GL_COND_LIBTOOL_FALSE,;t t
 s,@ALLOCA@,$ALLOCA,;t t
 s,@ALLOCA_H@,$ALLOCA_H,;t t
+s,@SYS_SOCKET_H@,$SYS_SOCKET_H,;t t
 s,@STDBOOL_H@,$STDBOOL_H,;t t
 s,@HAVE__BOOL@,$HAVE__BOOL,;t t
 s,@FNMATCH_H@,$FNMATCH_H,;t t
@@ -44203,7 +45080,7 @@
 s,@HAVE_LONG_64BIT@,$HAVE_LONG_64BIT,;t t
 s,@HAVE_LONG_LONG_64BIT@,$HAVE_LONG_LONG_64BIT,;t t
 s,@STDINT_H@,$STDINT_H,;t t
-s,@SYS_SOCKET_H@,$SYS_SOCKET_H,;t t
+s,@UNISTD_H@,$UNISTD_H,;t t
 s,@EOVERFLOW@,$EOVERFLOW,;t t
 s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
 s,@USE_NLS@,$USE_NLS,;t t
Index: ccvs/contrib/ChangeLog
diff -u ccvs/contrib/ChangeLog:1.178 ccvs/contrib/ChangeLog:1.179
--- ccvs/contrib/ChangeLog:1.178        Sun Mar 12 20:38:20 2006
+++ ccvs/contrib/ChangeLog      Mon Mar 20 02:21:55 2006
@@ -1,3 +1,7 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in: Regenerated.
+
 2006-03-12  Mark D. Baushke  <address@hidden>
 
        * validate_repo.pl (main, get_history, check_revision):
Index: ccvs/contrib/Makefile.in
diff -u ccvs/contrib/Makefile.in:1.122 ccvs/contrib/Makefile.in:1.123
--- ccvs/contrib/Makefile.in:1.122      Wed Jan 25 12:53:54 2006
+++ ccvs/contrib/Makefile.in    Mon Mar 20 02:21:55 2006
@@ -125,12 +125,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -246,6 +246,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/contrib/pam/ChangeLog
diff -u ccvs/contrib/pam/ChangeLog:1.6 ccvs/contrib/pam/ChangeLog:1.7
--- ccvs/contrib/pam/ChangeLog:1.6      Thu May  5 11:04:35 2005
+++ ccvs/contrib/pam/ChangeLog  Mon Mar 20 02:21:55 2006
@@ -1,3 +1,7 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in: Regenerated.
+
 2005-03-22  Brian Murphy <address@hidden>
 
        * cvs.linux, cvs.solaris: updated to add session support example.
Index: ccvs/contrib/pam/Makefile.in
diff -u ccvs/contrib/pam/Makefile.in:1.43 ccvs/contrib/pam/Makefile.in:1.44
--- ccvs/contrib/pam/Makefile.in:1.43   Wed Jan 25 12:53:54 2006
+++ ccvs/contrib/pam/Makefile.in        Mon Mar 20 02:21:55 2006
@@ -112,12 +112,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -212,6 +212,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/diff/ChangeLog
diff -u ccvs/diff/ChangeLog:1.116 ccvs/diff/ChangeLog:1.117
--- ccvs/diff/ChangeLog:1.116   Tue May 31 11:01:15 2005
+++ ccvs/diff/ChangeLog Mon Mar 20 02:21:55 2006
@@ -1,3 +1,7 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in: Regenerated.
+
 2004-05-31  Conrad T. Pino  <address@hidden>
 
        * libdiff.dsp: Add "../lib/timespec.h" and "../windows-NT/woe32.h".
Index: ccvs/diff/Makefile.in
diff -u ccvs/diff/Makefile.in:1.91 ccvs/diff/Makefile.in:1.92
--- ccvs/diff/Makefile.in:1.91  Wed Jan 25 12:53:54 2006
+++ ccvs/diff/Makefile.in       Mon Mar 20 02:21:55 2006
@@ -101,12 +101,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -221,6 +221,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.947 ccvs/doc/ChangeLog:1.948
--- ccvs/doc/ChangeLog:1.947    Wed Mar  1 21:59:48 2006
+++ ccvs/doc/ChangeLog  Mon Mar 20 02:21:55 2006
@@ -1,3 +1,7 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in: Regenerated.
+
 2006-02-28  Derek Price  <address@hidden>
 
        * cvs.texinfo (Editing administrative files): Import changes from Wiki.
Index: ccvs/doc/Makefile.in
diff -u ccvs/doc/Makefile.in:1.138 ccvs/doc/Makefile.in:1.139
--- ccvs/doc/Makefile.in:1.138  Wed Jan 25 12:53:54 2006
+++ ccvs/doc/Makefile.in        Mon Mar 20 02:21:55 2006
@@ -119,12 +119,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -242,6 +242,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/doc/i18n/Makefile.in
diff -u ccvs/doc/i18n/Makefile.in:1.26 ccvs/doc/i18n/Makefile.in:1.27
--- ccvs/doc/i18n/Makefile.in:1.26      Wed Jan 25 12:53:54 2006
+++ ccvs/doc/i18n/Makefile.in   Mon Mar 20 02:21:55 2006
@@ -111,12 +111,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -220,6 +220,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/doc/i18n/pt_BR/Makefile.in
diff -u ccvs/doc/i18n/pt_BR/Makefile.in:1.27 
ccvs/doc/i18n/pt_BR/Makefile.in:1.28
--- ccvs/doc/i18n/pt_BR/Makefile.in:1.27        Wed Jan 25 12:53:54 2006
+++ ccvs/doc/i18n/pt_BR/Makefile.in     Mon Mar 20 02:21:56 2006
@@ -111,12 +111,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -211,6 +211,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/doc/stamp-vti
diff -u ccvs/doc/stamp-vti:1.173 ccvs/doc/stamp-vti:1.174
--- ccvs/doc/stamp-vti:1.173    Wed Mar  1 21:59:48 2006
+++ ccvs/doc/stamp-vti  Mon Mar 20 02:21:55 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 1 March 2006
address@hidden UPDATED 16 March 2006
 @set UPDATED-MONTH March 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1
Index: ccvs/doc/version.texi
diff -u ccvs/doc/version.texi:1.174 ccvs/doc/version.texi:1.175
--- ccvs/doc/version.texi:1.174 Wed Mar  1 21:59:48 2006
+++ ccvs/doc/version.texi       Mon Mar 20 02:21:55 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 1 March 2006
address@hidden UPDATED 16 March 2006
 @set UPDATED-MONTH March 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1
Index: ccvs/lib/ChangeLog
diff -u ccvs/lib/ChangeLog:1.491 ccvs/lib/ChangeLog:1.492
--- ccvs/lib/ChangeLog:1.491    Fri Jan 27 07:38:45 2006
+++ ccvs/lib/ChangeLog  Mon Mar 20 02:21:56 2006
@@ -1,3 +1,12 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * closeout.c, fnmatch.c, fnmatch_loop.c, gai_strerror.c,
+       getaddrinfo.h, getcwd.c, getlogin_r.c, getlogin_r.h, glob.c,
+       lstat.c, openat.h, pagealign_alloc.c, regex.h, setenv.c,
+       socket_.h, time_r.c, time_r.h, unsetenv.c, xalloc-die.c: Update
+       from GNULIB.
+       * Makefile.gnulib, Makefile.in: Regenerated.
+
 2006-01-26  Mark D. Baushke  <address@hidden>
 
        * stdbool_.h: Update from GNULIB.
Index: ccvs/lib/Makefile.gnulib
diff -u ccvs/lib/Makefile.gnulib:1.66 ccvs/lib/Makefile.gnulib:1.67
--- ccvs/lib/Makefile.gnulib:1.66       Wed Jan 25 12:53:54 2006
+++ ccvs/lib/Makefile.gnulib    Mon Mar 20 02:21:56 2006
@@ -143,6 +143,12 @@
 
 ## end   gnulib module glob
 
+## begin gnulib module intprops
+
+EXTRA_DIST += intprops.h
+
+## end   gnulib module intprops
+
 ## begin gnulib module mbchar
 
 libgnu_a_SOURCES += mbchar.h
@@ -243,6 +249,18 @@
 
 ## end   gnulib module time_r
 
+## begin gnulib module unistd
+
+BUILT_SOURCES += $(UNISTD_H)
+
+# We need the following in order to create an empty placeholder for
+# <unistd.h> when the system doesn't have one.
+unistd.h:
+       echo '/* Empty placeholder for address@hidden  */' >$@
+MOSTLYCLEANFILES += unistd.h
+
+## end   gnulib module unistd
+
 ## begin gnulib module vasnprintf
 
 libgnu_a_SOURCES += printf-args.h printf-parse.h vasnprintf.h
Index: ccvs/lib/Makefile.in
diff -u ccvs/lib/Makefile.in:1.202 ccvs/lib/Makefile.in:1.203
--- ccvs/lib/Makefile.in:1.202  Wed Jan 25 12:53:54 2006
+++ ccvs/lib/Makefile.in        Mon Mar 20 02:21:56 2006
@@ -143,12 +143,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -271,6 +271,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/lib/closeout.c
diff -u ccvs/lib/closeout.c:1.3 ccvs/lib/closeout.c:1.4
--- ccvs/lib/closeout.c:1.3     Mon Sep 19 21:26:13 2005
+++ ccvs/lib/closeout.c Mon Mar 20 02:21:56 2006
@@ -1,7 +1,7 @@
 /* closeout.c - close standard output
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006 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
@@ -73,9 +73,9 @@
 void
 close_stdout (void)
 {
-  bool prev_fail = ferror (stdout);
-  bool none_pending = (0 == __fpending (stdout));
-  bool fclose_fail = fclose (stdout);
+  bool none_pending = (__fpending (stdout) == 0);
+  bool prev_fail = (ferror (stdout) != 0);
+  bool fclose_fail = (fclose (stdout) != 0);
 
   if (prev_fail || fclose_fail)
     {
Index: ccvs/lib/fnmatch.c
diff -u ccvs/lib/fnmatch.c:1.12 ccvs/lib/fnmatch.c:1.13
--- ccvs/lib/fnmatch.c:1.12     Mon Sep 19 21:26:13 2005
+++ ccvs/lib/fnmatch.c  Mon Mar 20 02:21:56 2006
@@ -1,4 +1,4 @@
-/* Copyright (C) 
1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005
+/* Copyright (C) 
1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006
        Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -180,7 +180,7 @@
 # define FCT   internal_fnmatch
 # define EXT   ext_match
 # define END   end_pattern
-# define L(CS) CS
+# define L_(CS)        CS
 # ifdef _LIBC
 #  define BTOWC(C)     __btowc (C)
 # else
@@ -210,7 +210,7 @@
 #  define FCT  internal_fnwmatch
 #  define EXT  ext_wmatch
 #  define END  end_wpattern
-#  define L(CS)        L##CS
+#  define L_(CS)       L##CS
 #  define BTOWC(C)     (C)
 #  ifdef _LIBC
 #   define STRLEN(S) __wcslen (S)
Index: ccvs/lib/fnmatch_loop.c
diff -u ccvs/lib/fnmatch_loop.c:1.4 ccvs/lib/fnmatch_loop.c:1.5
--- ccvs/lib/fnmatch_loop.c:1.4 Fri Jun 10 20:30:20 2005
+++ ccvs/lib/fnmatch_loop.c     Mon Mar 20 02:21:56 2006
@@ -1,4 +1,4 @@
-/* Copyright (C) 
1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005
+/* Copyright (C) 
1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006
        Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -39,14 +39,14 @@
 # endif
 #endif
 
-  while ((c = *p++) != L('\0'))
+  while ((c = *p++) != L_('\0'))
     {
       bool new_no_leading_period = false;
       c = FOLD (c);
 
       switch (c)
        {
-       case L('?'):
+       case L_('?'):
          if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
            {
              int res;
@@ -59,17 +59,17 @@
 
          if (n == string_end)
            return FNM_NOMATCH;
-         else if (*n == L('/') && (flags & FNM_FILE_NAME))
+         else if (*n == L_('/') && (flags & FNM_FILE_NAME))
            return FNM_NOMATCH;
-         else if (*n == L('.') && no_leading_period)
+         else if (*n == L_('.') && no_leading_period)
            return FNM_NOMATCH;
          break;
 
-       case L('\\'):
+       case L_('\\'):
          if (!(flags & FNM_NOESCAPE))
            {
              c = *p++;
-             if (c == L('\0'))
+             if (c == L_('\0'))
                /* Trailing \ loses.  */
                return FNM_NOMATCH;
              c = FOLD (c);
@@ -78,7 +78,7 @@
            return FNM_NOMATCH;
          break;
 
-       case L('*'):
+       case L_('*'):
          if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
            {
              int res;
@@ -89,12 +89,12 @@
                return res;
            }
 
-         if (n != string_end && *n == L('.') && no_leading_period)
+         if (n != string_end && *n == L_('.') && no_leading_period)
            return FNM_NOMATCH;
 
-         for (c = *p++; c == L('?') || c == L('*'); c = *p++)
+         for (c = *p++; c == L_('?') || c == L_('*'); c = *p++)
            {
-             if (*p == L('(') && (flags & FNM_EXTMATCH) != 0)
+             if (*p == L_('(') && (flags & FNM_EXTMATCH) != 0)
                {
                  const CHAR *endp = END (p);
                  if (endp != p)
@@ -105,13 +105,13 @@
                    }
                }
 
-             if (c == L('?'))
+             if (c == L_('?'))
                {
                  /* A ? needs to match one character.  */
                  if (n == string_end)
                    /* There isn't another character; no match.  */
                    return FNM_NOMATCH;
-                 else if (*n == L('/')
+                 else if (*n == L_('/')
                           && __builtin_expect (flags & FNM_FILE_NAME, 0))
                    /* A slash does not match a wildcard under
                       FNM_FILE_NAME.  */
@@ -124,7 +124,7 @@
                }
            }
 
-         if (c == L('\0'))
+         if (c == L_('\0'))
            /* The wildcard(s) is/are the last element of the pattern.
               If the name is a file name and contains another slash
               this means it cannot match, unless the FNM_LEADING_DIR
@@ -138,7 +138,7 @@
                    result = 0;
                  else
                    {
-                     if (MEMCHR (n, L('/'), string_end - n) == NULL)
+                     if (MEMCHR (n, L_('/'), string_end - n) == NULL)
                        result = 0;
                    }
                }
@@ -149,15 +149,15 @@
            {
              const CHAR *endp;
 
-             endp = MEMCHR (n, (flags & FNM_FILE_NAME) ? L('/') : L('\0'),
+             endp = MEMCHR (n, (flags & FNM_FILE_NAME) ? L_('/') : L_('\0'),
                             string_end - n);
              if (endp == NULL)
                endp = string_end;
 
-             if (c == L('[')
+             if (c == L_('[')
                  || (__builtin_expect (flags & FNM_EXTMATCH, 0) != 0
-                     && (c == L('@') || c == L('+') || c == L('!'))
-                     && *p == L('(')))
+                     && (c == L_('@') || c == L_('+') || c == L_('!'))
+                     && *p == L_('(')))
                {
                  int flags2 = ((flags & FNM_FILE_NAME)
                                ? flags : (flags & ~FNM_PERIOD));
@@ -168,11 +168,11 @@
                        == 0)
                      return 0;
                }
-             else if (c == L('/') && (flags & FNM_FILE_NAME))
+             else if (c == L_('/') && (flags & FNM_FILE_NAME))
                {
-                 while (n < string_end && *n != L('/'))
+                 while (n < string_end && *n != L_('/'))
                    ++n;
-                 if (n < string_end && *n == L('/')
+                 if (n < string_end && *n == L_('/')
                      && (FCT (p, n + 1, string_end, flags & FNM_PERIOD, flags)
                          == 0))
                    return 0;
@@ -183,7 +183,7 @@
                                ? flags : (flags & ~FNM_PERIOD));
                  int no_leading_period2 = no_leading_period;
 
-                 if (c == L('\\') && !(flags & FNM_NOESCAPE))
+                 if (c == L_('\\') && !(flags & FNM_NOESCAPE))
                    c = *p;
                  c = FOLD (c);
                  for (--p; n < endp; ++n, no_leading_period2 = false)
@@ -197,7 +197,7 @@
          /* If we come here no match is possible with the wildcard.  */
          return FNM_NOMATCH;
 
-       case L('['):
+       case L_('['):
          {
            /* Nonzero if the sense of the character class is inverted.  */
            register bool not;
@@ -210,14 +210,14 @@
            if (n == string_end)
              return FNM_NOMATCH;
 
-           if (*n == L('.') && no_leading_period)
+           if (*n == L_('.') && no_leading_period)
              return FNM_NOMATCH;
 
-           if (*n == L('/') && (flags & FNM_FILE_NAME))
+           if (*n == L_('/') && (flags & FNM_FILE_NAME))
              /* `/' cannot be matched.  */
              return FNM_NOMATCH;
 
-           not = (*p == L('!') || (posixly_correct < 0 && *p == L('^')));
+           not = (*p == L_('!') || (posixly_correct < 0 && *p == L_('^')));
            if (not)
              ++p;
 
@@ -226,9 +226,9 @@
            c = *p++;
            for (;;)
              {
-               if (!(flags & FNM_NOESCAPE) && c == L('\\'))
+               if (!(flags & FNM_NOESCAPE) && c == L_('\\'))
                  {
-                   if (*p == L('\0'))
+                   if (*p == L_('\0'))
                      return FNM_NOMATCH;
                    c = FOLD ((UCHAR) *p);
                    ++p;
@@ -236,7 +236,7 @@
                    if (c == fn)
                      goto matched;
                  }
-               else if (c == L('[') && *p == L(':'))
+               else if (c == L_('[') && *p == L_(':'))
                  {
                    /* Leave room for the null.  */
                    CHAR str[CHAR_CLASS_MAX_LENGTH + 1];
@@ -254,22 +254,22 @@
                          return FNM_NOMATCH;
 
                        c = *++p;
-                       if (c == L(':') && p[1] == L(']'))
+                       if (c == L_(':') && p[1] == L_(']'))
                          {
                            p += 2;
                            break;
                          }
-                       if (c < L('a') || c >= L('z'))
+                       if (c < L_('a') || c >= L_('z'))
                          {
                            /* This cannot possibly be a character class name.
                               Match it as a normal range.  */
                            p = startp;
-                           c = L('[');
+                           c = L_('[');
                            goto normal_bracket;
                          }
                        str[c1++] = c;
                      }
-                   str[c1] = L('\0');
+                   str[c1] = L_('\0');
 
 #if defined _LIBC || WIDE_CHAR_SUPPORT
                    wt = IS_CHAR_CLASS (str);
@@ -288,24 +288,24 @@
                      goto matched;
 # endif
 #else
-                   if ((STREQ (str, L("alnum")) && ISALNUM ((UCHAR) *n))
-                       || (STREQ (str, L("alpha")) && ISALPHA ((UCHAR) *n))
-                       || (STREQ (str, L("blank")) && ISBLANK ((UCHAR) *n))
-                       || (STREQ (str, L("cntrl")) && ISCNTRL ((UCHAR) *n))
-                       || (STREQ (str, L("digit")) && ISDIGIT ((UCHAR) *n))
-                       || (STREQ (str, L("graph")) && ISGRAPH ((UCHAR) *n))
-                       || (STREQ (str, L("lower")) && ISLOWER ((UCHAR) *n))
-                       || (STREQ (str, L("print")) && ISPRINT ((UCHAR) *n))
-                       || (STREQ (str, L("punct")) && ISPUNCT ((UCHAR) *n))
-                       || (STREQ (str, L("space")) && ISSPACE ((UCHAR) *n))
-                       || (STREQ (str, L("upper")) && ISUPPER ((UCHAR) *n))
-                       || (STREQ (str, L("xdigit")) && ISXDIGIT ((UCHAR) *n)))
+                   if ((STREQ (str, L_("alnum")) && ISALNUM ((UCHAR) *n))
+                       || (STREQ (str, L_("alpha")) && ISALPHA ((UCHAR) *n))
+                       || (STREQ (str, L_("blank")) && ISBLANK ((UCHAR) *n))
+                       || (STREQ (str, L_("cntrl")) && ISCNTRL ((UCHAR) *n))
+                       || (STREQ (str, L_("digit")) && ISDIGIT ((UCHAR) *n))
+                       || (STREQ (str, L_("graph")) && ISGRAPH ((UCHAR) *n))
+                       || (STREQ (str, L_("lower")) && ISLOWER ((UCHAR) *n))
+                       || (STREQ (str, L_("print")) && ISPRINT ((UCHAR) *n))
+                       || (STREQ (str, L_("punct")) && ISPUNCT ((UCHAR) *n))
+                       || (STREQ (str, L_("space")) && ISSPACE ((UCHAR) *n))
+                       || (STREQ (str, L_("upper")) && ISUPPER ((UCHAR) *n))
+                       || (STREQ (str, L_("xdigit")) && ISXDIGIT ((UCHAR) *n)))
                      goto matched;
 #endif
                    c = *p++;
                  }
 #ifdef _LIBC
-               else if (c == L('[') && *p == L('='))
+               else if (c == L_('[') && *p == L_('='))
                  {
                    UCHAR str[1];
                    uint32_t nrules =
@@ -313,19 +313,19 @@
                    const CHAR *startp = p;
 
                    c = *++p;
-                   if (c == L('\0'))
+                   if (c == L_('\0'))
                      {
                        p = startp;
-                       c = L('[');
+                       c = L_('[');
                        goto normal_bracket;
                      }
                    str[0] = c;
 
                    c = *++p;
-                   if (c != L('=') || p[1] != L(']'))
+                   if (c != L_('=') || p[1] != L_(']'))
                      {
                        p = startp;
-                       c = L('[');
+                       c = L_('[');
                        goto normal_bracket;
                      }
                    p += 2;
@@ -405,7 +405,7 @@
                    c = *p++;
                  }
 #endif
-               else if (c == L('\0'))
+               else if (c == L_('\0'))
                  /* [ (unterminated) loses.  */
                  return FNM_NOMATCH;
                else
@@ -415,7 +415,7 @@
 #ifdef _LIBC
                    bool is_seqval = false;
 
-                   if (c == L('[') && *p == L('.'))
+                   if (c == L_('[') && *p == L_('.'))
                      {
                        uint32_t nrules =
                          _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
@@ -425,7 +425,7 @@
                        while (1)
                          {
                            c = *++p;
-                           if (c == L('.') && p[1] == L(']'))
+                           if (c == L_('.') && p[1] == L_(']'))
                              {
                                p += 2;
                                break;
@@ -438,7 +438,7 @@
                        /* We have to handling the symbols differently in
                           ranges since then the collation sequence is
                           important.  */
-                       is_range = *p == L('-') && p[1] != L('\0');
+                       is_range = *p == L_('-') && p[1] != L_('\0');
 
                        if (nrules == 0)
                          {
@@ -586,8 +586,8 @@
                        /* We have to handling the symbols differently in
                           ranges since then the collation sequence is
                           important.  */
-                       is_range = (*p == L('-') && p[1] != L('\0')
-                                   && p[1] != L(']'));
+                       is_range = (*p == L_('-') && p[1] != L_('\0')
+                                   && p[1] != L_(']'));
 
                        if (!is_range && c == fn)
                          goto matched;
@@ -596,7 +596,7 @@
                        c = *p++;
                      }
 
-                   if (c == L('-') && *p != L(']'))
+                   if (c == L_('-') && *p != L_(']'))
                      {
 #if _LIBC
                        /* We have to find the collation sequence
@@ -630,7 +630,7 @@
 # endif
 
                        is_seqval = false;
-                       if (cend == L('[') && *p == L('.'))
+                       if (cend == L_('[') && *p == L_('.'))
                          {
                            uint32_t nrules =
                              _NL_CURRENT_WORD (LC_COLLATE,
@@ -641,7 +641,7 @@
                            while (1)
                              {
                                c = *++p;
-                               if (c == L('.') && p[1] == L(']'))
+                               if (c == L_('.') && p[1] == L_(']'))
                                  {
                                    p += 2;
                                    break;
@@ -760,9 +760,9 @@
                          }
                        else
                          {
-                           if (!(flags & FNM_NOESCAPE) && cend == L('\\'))
+                           if (!(flags & FNM_NOESCAPE) && cend == L_('\\'))
                              cend = *p++;
-                           if (cend == L('\0'))
+                           if (cend == L_('\0'))
                              return FNM_NOMATCH;
                            cend = FOLD (cend);
                          }
@@ -814,9 +814,9 @@
                           and sometimes fatal consequences.  */
                        UCHAR cend = *p++;
 
-                       if (!(flags & FNM_NOESCAPE) && cend == L('\\'))
+                       if (!(flags & FNM_NOESCAPE) && cend == L_('\\'))
                          cend = *p++;
-                       if (cend == L('\0'))
+                       if (cend == L_('\0'))
                          return FNM_NOMATCH;
 
                        /* It is a range.  */
@@ -828,7 +828,7 @@
                      }
                  }
 
-               if (c == L(']'))
+               if (c == L_(']'))
                  break;
              }
 
@@ -843,18 +843,18 @@
              ignore_next:
                c = *p++;
 
-               if (c == L('\0'))
+               if (c == L_('\0'))
                  /* [... (unterminated) loses.  */
                  return FNM_NOMATCH;
 
-               if (!(flags & FNM_NOESCAPE) && c == L('\\'))
+               if (!(flags & FNM_NOESCAPE) && c == L_('\\'))
                  {
-                   if (*p == L('\0'))
+                   if (*p == L_('\0'))
                      return FNM_NOMATCH;
                    /* XXX 1003.2d11 is unclear if this is right.  */
                    ++p;
                  }
-               else if (c == L('[') && *p == L(':'))
+               else if (c == L_('[') && *p == L_(':'))
                  {
                    int c1 = 0;
                    const CHAR *startp = p;
@@ -865,10 +865,10 @@
                        if (++c1 == CHAR_CLASS_MAX_LENGTH)
                          return FNM_NOMATCH;
 
-                       if (*p == L(':') && p[1] == L(']'))
+                       if (*p == L_(':') && p[1] == L_(']'))
                          break;
 
-                       if (c < L('a') || c >= L('z'))
+                       if (c < L_('a') || c >= L_('z'))
                          {
                            p = startp;
                            goto ignore_next;
@@ -877,18 +877,18 @@
                    p += 2;
                    c = *p++;
                  }
-               else if (c == L('[') && *p == L('='))
+               else if (c == L_('[') && *p == L_('='))
                  {
                    c = *++p;
-                   if (c == L('\0'))
+                   if (c == L_('\0'))
                      return FNM_NOMATCH;
                    c = *++p;
-                   if (c != L('=') || p[1] != L(']'))
+                   if (c != L_('=') || p[1] != L_(']'))
                      return FNM_NOMATCH;
                    p += 2;
                    c = *p++;
                  }
-               else if (c == L('[') && *p == L('.'))
+               else if (c == L_('[') && *p == L_('.'))
                  {
                    ++p;
                    while (1)
@@ -897,22 +897,22 @@
                        if (c == '\0')
                          return FNM_NOMATCH;
 
-                       if (*p == L('.') && p[1] == L(']'))
+                       if (*p == L_('.') && p[1] == L_(']'))
                          break;
                      }
                    p += 2;
                    c = *p++;
                  }
              }
-           while (c != L(']'));
+           while (c != L_(']'));
            if (not)
              return FNM_NOMATCH;
          }
          break;
 
-       case L('+'):
-       case L('@'):
-       case L('!'):
+       case L_('+'):
+       case L_('@'):
+       case L_('!'):
          if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
            {
              int res;
@@ -923,7 +923,7 @@
            }
          goto normal_match;
 
-       case L('/'):
+       case L_('/'):
          if (NO_LEADING_PERIOD (flags))
            {
              if (n == string_end || c != (UCHAR) *n)
@@ -946,7 +946,7 @@
   if (n == string_end)
     return 0;
 
-  if ((flags & FNM_LEADING_DIR) && n != string_end && *n == L('/'))
+  if ((flags & FNM_LEADING_DIR) && n != string_end && *n == L_('/'))
     /* The FNM_LEADING_DIR flag says that "foo*" matches "foobar/frobozz".  */
     return 0;
 
@@ -961,10 +961,10 @@
   const CHAR *p = pattern;
 
   while (1)
-    if (*++p == L('\0'))
+    if (*++p == L_('\0'))
       /* This is an invalid pattern.  */
       return pattern;
-    else if (*p == L('['))
+    else if (*p == L_('['))
       {
        /* Handle brackets special.  */
        if (posixly_correct == 0)
@@ -972,21 +972,21 @@
 
        /* Skip the not sign.  We have to recognize it because of a possibly
           following ']'.  */
-       if (*++p == L('!') || (posixly_correct < 0 && *p == L('^')))
+       if (*++p == L_('!') || (posixly_correct < 0 && *p == L_('^')))
          ++p;
        /* A leading ']' is recognized as such.  */
-       if (*p == L(']'))
+       if (*p == L_(']'))
          ++p;
        /* Skip over all characters of the list.  */
-       while (*p != L(']'))
-         if (*p++ == L('\0'))
+       while (*p != L_(']'))
+         if (*p++ == L_('\0'))
            /* This is no valid pattern.  */
            return pattern;
       }
-    else if ((*p == L('?') || *p == L('*') || *p == L('+') || *p == L('@')
-             || *p == L('!')) && p[1] == L('('))
+    else if ((*p == L_('?') || *p == L_('*') || *p == L_('+') || *p == L_('@')
+             || *p == L_('!')) && p[1] == L_('('))
       p = END (p + 1);
-    else if (*p == L(')'))
+    else if (*p == L_(')'))
       break;
 
   return p + 1;
@@ -1014,10 +1014,10 @@
   /* Parse the pattern.  Store the individual parts in the list.  */
   level = 0;
   for (startp = p = pattern + 1; ; ++p)
-    if (*p == L('\0'))
+    if (*p == L_('\0'))
       /* This is an invalid pattern.  */
       return -1;
-    else if (*p == L('['))
+    else if (*p == L_('['))
       {
        /* Handle brackets special.  */
        if (posixly_correct == 0)
@@ -1025,22 +1025,22 @@
 
        /* Skip the not sign.  We have to recognize it because of a possibly
           following ']'.  */
-       if (*++p == L('!') || (posixly_correct < 0 && *p == L('^')))
+       if (*++p == L_('!') || (posixly_correct < 0 && *p == L_('^')))
          ++p;
        /* A leading ']' is recognized as such.  */
-       if (*p == L(']'))
+       if (*p == L_(']'))
          ++p;
        /* Skip over all characters of the list.  */
-       while (*p != L(']'))
-         if (*p++ == L('\0'))
+       while (*p != L_(']'))
+         if (*p++ == L_('\0'))
            /* This is no valid pattern.  */
            return -1;
       }
-    else if ((*p == L('?') || *p == L('*') || *p == L('+') || *p == L('@')
-             || *p == L('!')) && p[1] == L('('))
+    else if ((*p == L_('?') || *p == L_('*') || *p == L_('+') || *p == L_('@')
+             || *p == L_('!')) && p[1] == L_('('))
       /* Remember the nesting level.  */
       ++level;
-    else if (*p == L(')'))
+    else if (*p == L_(')'))
       {
        if (level-- == 0)
          {
@@ -1051,7 +1051,7 @@
            size_t plensize;                                                  \
            size_t newpsize;                                                  \
                                                                              \
-           plen = (opt == L('?') || opt == L('@')                            \
+           plen = (opt == L_('?') || opt == L_('@')                          \
                    ? pattern_len                                             \
                    : p - startp + 1);                                        \
            plensize = plen * sizeof (CHAR);                                  \
@@ -1061,7 +1061,7 @@
                || ALLOCA_LIMIT <= newpsize)                                  \
              return -1;                                                      \
            newp = (struct patternlist *) alloca (newpsize);                  \
-           *((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L('\0');    \
+           *((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L_('\0');    \
            newp->next = NULL;                                                \
            *lastp = newp;                                                    \
            lastp = &newp->next
@@ -1069,7 +1069,7 @@
            break;
          }
       }
-    else if (*p == L('|'))
+    else if (*p == L_('|'))
       {
        if (level == 0)
          {
@@ -1078,17 +1078,17 @@
          }
       }
   assert (list != NULL);
-  assert (p[-1] == L(')'));
+  assert (p[-1] == L_(')'));
 #undef NEW_PATTERN
 
   switch (opt)
     {
-    case L('*'):
+    case L_('*'):
       if (FCT (p, string, string_end, no_leading_period, flags) == 0)
        return 0;
       /* FALLTHROUGH */
 
-    case L('+'):
+    case L_('+'):
       do
        {
          for (rs = string; rs <= string_end; ++rs)
@@ -1120,12 +1120,12 @@
       /* None of the patterns lead to a match.  */
       return FNM_NOMATCH;
 
-    case L('?'):
+    case L_('?'):
       if (FCT (p, string, string_end, no_leading_period, flags) == 0)
        return 0;
       /* FALLTHROUGH */
 
-    case L('@'):
+    case L_('@'):
       do
        /* I cannot believe it but `strcat' is actually acceptable
           here.  Match the entire string with the prefix from the
@@ -1141,7 +1141,7 @@
       /* None of the patterns lead to a match.  */
       return FNM_NOMATCH;
 
-    case L('!'):
+    case L_('!'):
       for (rs = string; rs <= string_end; ++rs)
        {
          struct patternlist *runp;
@@ -1188,5 +1188,5 @@
 #undef STRCOLL
 #undef STRLEN
 #undef STRCAT
-#undef L
+#undef L_
 #undef BTOWC
Index: ccvs/lib/gai_strerror.c
diff -u ccvs/lib/gai_strerror.c:1.2 ccvs/lib/gai_strerror.c:1.3
--- ccvs/lib/gai_strerror.c:1.2 Mon Sep 12 14:26:49 2005
+++ ccvs/lib/gai_strerror.c     Mon Mar 20 02:21:56 2006
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, 
Inc.
    This file is part of the GNU C Library.
    Contributed by Philip Blundell <address@hidden>, 1997.
 
@@ -25,7 +25,9 @@
 #endif
 
 #include <stdio.h>
-#include <netdb.h>
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
 
 #ifdef _LIBC
 # include <libintl.h>
Index: ccvs/lib/getaddrinfo.h
diff -u ccvs/lib/getaddrinfo.h:1.6 ccvs/lib/getaddrinfo.h:1.7
--- ccvs/lib/getaddrinfo.h:1.6  Mon Nov 28 02:35:49 2005
+++ ccvs/lib/getaddrinfo.h      Mon Mar 20 02:21:56 2006
@@ -1,5 +1,5 @@
 /* Get address information.
-   Copyright (C) 1996-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-2002, 2003, 2004, 2005, 2006 Free Software Foundation, 
Inc.
    Contributed by Simon Josefsson <address@hidden>.
 
    This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,9 @@
 # include <sys/types.h>
 /* Get all getaddrinfo related declarations, if available.  */
 # include <sys/socket.h>
+#ifdef HAVE_NETDB_H
 # include <netdb.h>
+#endif
 
 # ifndef HAVE_STRUCT_ADDRINFO
 
@@ -65,10 +67,18 @@
 #  define EAI_FAMILY     -6    /* `ai_family' not supported.  */
 #  define EAI_SOCKTYPE   -7    /* `ai_socktype' not supported.  */
 #  define EAI_SERVICE    -8    /* SERVICE not supported for `ai_socktype'.  */
-#  define EAI_ADDRFAMILY  -9   /* Address family for NAME not supported.  */
 #  define EAI_MEMORY     -10   /* Memory allocation failure.  */
-#  define EAI_SYSTEM     -11   /* System error returned in `errno'.  */
 #  define EAI_OVERFLOW   -12   /* Argument buffer overflow.  */
+#endif
+# ifndef EAI_ADDRFAMILY
+/* Not defined on mingw32.  XXX May be incorrect? Perhaps it is never
+   returned? */
+#  define EAI_ADDRFAMILY  -9   /* Address family for NAME not supported.  */
+# endif
+# ifndef EAI_SYSTEM
+/* Not defined on mingw32.  XXX May be incorrect? Perhaps it is never
+   returned? */
+#  define EAI_SYSTEM     -11   /* System error returned in `errno'.  */
 # endif
 
 # ifdef __USE_GNU
Index: ccvs/lib/getcwd.c
diff -u ccvs/lib/getcwd.c:1.7 ccvs/lib/getcwd.c:1.8
--- ccvs/lib/getcwd.c:1.7       Mon Nov 28 02:35:49 2005
+++ ccvs/lib/getcwd.c   Mon Mar 20 02:21:56 2006
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2004,2005 Free Software
+/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2004,2005,2006 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -74,6 +74,14 @@
 
 #include <limits.h>
 
+/* Work around a bug in Solaris 9 and 10: AT_FDCWD is positive.  Its
+   value exceeds INT_MAX, so its use as an int doesn't conform to the
+   C standard, and GCC and Sun C complain in some cases.  */
+#if 0 < AT_FDCWD && AT_FDCWD == 0xffd19553
+# undef AT_FDCWD
+# define AT_FDCWD (-3041965)
+#endif
+
 #ifdef ENAMETOOLONG
 # define is_ENAMETOOLONG(x) ((x) == ENAMETOOLONG)
 #else
Index: ccvs/lib/getlogin_r.c
diff -u ccvs/lib/getlogin_r.c:1.4 ccvs/lib/getlogin_r.c:1.5
--- ccvs/lib/getlogin_r.c:1.4   Mon Sep 19 21:26:13 2005
+++ ccvs/lib/getlogin_r.c       Mon Mar 20 02:21:56 2006
@@ -26,10 +26,7 @@
 
 #include <errno.h>
 #include <string.h>
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if !HAVE_DECL_GETLOGIN
 char *getlogin (void);
Index: ccvs/lib/getlogin_r.h
diff -u ccvs/lib/getlogin_r.h:1.4 ccvs/lib/getlogin_r.h:1.5
--- ccvs/lib/getlogin_r.h:1.4   Fri Aug 12 20:58:10 2005
+++ ccvs/lib/getlogin_r.h       Mon Mar 20 02:21:56 2006
@@ -19,10 +19,7 @@
 /* Written by Paul Eggert and Derek Price.  */
 
 #include <stddef.h>
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 /* Copies the user's login name to NAME.
    The array pointed to by NAME has room for SIZE bytes.
Index: ccvs/lib/glob.c
diff -u ccvs/lib/glob.c:1.17 ccvs/lib/glob.c:1.18
--- ccvs/lib/glob.c:1.17        Fri Sep  9 22:00:23 2005
+++ ccvs/lib/glob.c     Mon Mar 20 02:21:56 2006
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002,2003,2004,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2002,2003,2004,2005,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -34,13 +34,10 @@
 #include <stdio.h>             /* Needed on stupid SunOS for assert.  */
 
 #if !defined _LIBC || !defined GLOB_ONLY_P
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-# ifndef POSIX
-#  ifdef _POSIX_VERSION
-#   define POSIX
-#  endif
-# endif
+
+#include <unistd.h>
+#if !defined POSIX && defined _POSIX_VERSION
+# define POSIX
 #endif
 
 #include <pwd.h>
@@ -322,7 +319,7 @@
          next = next_brace_sub (begin + 1, flags);
          if (next == NULL)
            {
-             /* It is an illegal expression.  */
+             /* It is an invalid expression.  */
 #ifndef __GNUC__
              free (onealt);
 #endif
@@ -336,7 +333,7 @@
              rest = next_brace_sub (rest + 1, flags);
              if (rest == NULL)
                {
-                 /* It is an illegal expression.  */
+                 /* It is an invalid expression.  */
 #ifndef __GNUC__
                  free (onealt);
 #endif
Index: ccvs/lib/lstat.c
diff -u ccvs/lib/lstat.c:1.5 ccvs/lib/lstat.c:1.6
--- ccvs/lib/lstat.c:1.5        Mon Sep 19 21:26:13 2005
+++ ccvs/lib/lstat.c    Mon Mar 20 02:21:56 2006
@@ -1,6 +1,6 @@
 /* Work around a bug of lstat on some systems
 
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 
Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -30,28 +30,28 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #include "stat-macros.h"
-#include "xalloc.h"
 
 /* lstat works differently on Linux and Solaris systems.  POSIX (see
-   `pathname resolution' in the glossary) requires that programs like `ls'
-   take into consideration the fact that FILE has a trailing slash when
-   FILE is a symbolic link.  On Linux systems, the lstat function already
-   has the desired semantics (in treating `lstat("symlink/",sbuf)' just like
-   `lstat("symlink/.",sbuf)', but on Solaris it does not.
+   `pathname resolution' in the glossary) requires that programs like
+   `ls' take into consideration the fact that FILE has a trailing slash
+   when FILE is a symbolic link.  On Linux and Solaris 10 systems, the
+   lstat function already has the desired semantics (in treating
+   `lstat ("symlink/", sbuf)' just like `lstat ("symlink/.", sbuf)',
+   but on Solaris 9 and earlier it does not.
 
    If FILE has a trailing slash and specifies a symbolic link,
-   then append a `.' to FILE and call lstat a second time.  */
+   then use stat() to get more info on the referent of FILE.
+   If the referent is a non-directory, then set errno to ENOTDIR
+   and return -1.  Otherwise, return stat's result.  */
 
 int
 rpl_lstat (const char *file, struct stat *sbuf)
 {
   size_t len;
-  char *new_file;
-
   int lstat_result = lstat (file, sbuf);
 
   if (lstat_result != 0 || !S_ISLNK (sbuf->st_mode))
@@ -59,19 +59,22 @@
 
   len = strlen (file);
   if (len == 0 || file[len - 1] != '/')
-    return lstat_result;
+    return 0;
 
   /* FILE refers to a symbolic link and the name ends with a slash.
-     Append a `.' to FILE and repeat the lstat call.  */
-
-  /* Add one for the `.' we'll append, and one more for the trailing NUL.  */
-  new_file = xmalloc (len + 1 + 1);
-  memcpy (new_file, file, len);
-  new_file[len] = '.';
-  new_file[len + 1] = 0;
-
-  lstat_result = lstat (new_file, sbuf);
-  free (new_file);
+     Call stat() to get info about the link's referent.  */
 
-  return lstat_result;
+  /* If stat fails, then we do the same.  */
+  if (stat (file, sbuf) != 0)
+    return -1;
+
+  /* If FILE references a directory, return 0.  */
+  if (S_ISDIR (sbuf->st_mode))
+    return 0;
+
+  /* Here, we know stat succeeded and FILE references a non-directory.
+     But it was specified via a name including a trailing slash.
+     Fail with errno set to ENOTDIR to indicate the contradiction.  */
+  errno = ENOTDIR;
+  return -1;
 }
Index: ccvs/lib/openat.h
diff -u ccvs/lib/openat.h:1.6 ccvs/lib/openat.h:1.7
--- ccvs/lib/openat.h:1.6       Wed Jan 25 12:53:38 2006
+++ ccvs/lib/openat.h   Mon Mar 20 02:21:56 2006
@@ -1,5 +1,5 @@
 /* provide a replacement openat function
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 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
@@ -35,10 +35,24 @@
 # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
 #endif
 
+/* Work around a bug in Solaris 9 and 10: AT_FDCWD is positive.  Its
+   value exceeds INT_MAX, so its use as an int doesn't conform to the
+   C standard, and GCC and Sun C complain in some cases.  If the bug
+   is present, undef AT_FDCWD here, so it can be redefined below.  */
+#if 0 < AT_FDCWD && AT_FDCWD == 0xffd19553
+# undef AT_FDCWD
+#endif
+
+/* Use the same bit pattern as Solaris 9, but with the proper
+   signedness.  The bit pattern is important, in case this actually is
+   Solaris with the above workaround.  */
 #ifndef AT_FDCWD
+# define AT_FDCWD (-3041965)
+#endif
+
 /* Use the same values as Solaris 9.  This shouldn't matter, but
    there's no real reason to differ.  */
-# define AT_FDCWD (-3041965)
+#ifndef AT_SYMLINK_NOFOLLOW
 # define AT_SYMLINK_NOFOLLOW 4096
 # define AT_REMOVEDIR 1
 #endif
Index: ccvs/lib/pagealign_alloc.c
diff -u ccvs/lib/pagealign_alloc.c:1.4 ccvs/lib/pagealign_alloc.c:1.5
--- ccvs/lib/pagealign_alloc.c:1.4      Fri Aug 12 20:58:10 2005
+++ ccvs/lib/pagealign_alloc.c  Mon Mar 20 02:21:56 2006
@@ -29,10 +29,7 @@
 #include <stdlib.h>
 
 #include <fcntl.h>
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if HAVE_MMAP
 # include <sys/mman.h>
Index: ccvs/lib/regex.h
diff -u ccvs/lib/regex.h:1.10 ccvs/lib/regex.h:1.11
--- ccvs/lib/regex.h:1.10       Sun Sep  4 05:58:56 2005
+++ ccvs/lib/regex.h    Mon Mar 20 02:21:56 2006
@@ -1,6 +1,6 @@
 /* Definitions for data structures and routines for the regular
    expression library.
-   Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005
+   Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -53,11 +53,13 @@
 
 /* The type of the offset of a byte within a string.
    For historical reasons POSIX 1003.1-2004 requires that regoff_t be
-   at least as wide as off_t.  This is a bit odd (and many common
-   POSIX platforms set it to the more-sensible ssize_t) but we might
-   as well conform.  We don't know of any hosts where ssize_t is wider
-   than off_t, so off_t is safe.  */
-typedef off_t regoff_t;
+   at least as wide as off_t.  However, many common POSIX platforms set
+   regoff_t to the more-sensible ssize_t and the Open Group has
+   signalled its intention to change the requirement to be that
+   regoff_t be at least as wide as ptrdiff_t and ssize_t; see XBD ERN
+   60 (2005-08-25).  We don't know of any hosts where ssize_t or
+   ptrdiff_t is wider than long int, so long int is safe.  */
+typedef long int regoff_t;
 
 /* The type of nonnegative object indexes.  Traditionally, GNU regex
    uses 'int' for these.  Code that uses __re_idx_t should work
Index: ccvs/lib/setenv.c
diff -u ccvs/lib/setenv.c:1.3 ccvs/lib/setenv.c:1.4
--- ccvs/lib/setenv.c:1.3       Mon May 23 17:44:32 2005
+++ ccvs/lib/setenv.c   Mon Mar 20 02:21:56 2006
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003,2005 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
@@ -27,9 +27,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#if _LIBC || HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if !_LIBC
 # include "allocsa.h"
Index: ccvs/lib/socket_.h
diff -u ccvs/lib/socket_.h:1.1 ccvs/lib/socket_.h:1.2
--- ccvs/lib/socket_.h:1.1      Wed Jan 25 12:53:38 2006
+++ ccvs/lib/socket_.h  Mon Mar 20 02:21:56 2006
@@ -28,6 +28,22 @@
    we need. */
 
 #if HAVE_WINSOCK2_H
+/* The following define makes sure we get all the prototypes from the
+   header files.  getaddrinfo is only available if _WIN32_WINNT >=
+   0x0501 (that symbol is set indiriectly through WINVER).  This has
+   the following two (potential) problems:
+
+     1) winsock2.h must not have been included before this symbol
+        is set (I think).
+
+     2) There may be some _reason_ for all prototypes not being
+        available with the default settings.  Such as if some APIs are
+        not available on older Windows hosts.  However, getaddrinfo
+        (which need >= 0x0501) should be available on Windows 95 and
+        later, according to:
+        
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winsock/winsock/getaddrinfo_2.asp
+*/
+#define WINVER 0x0501
 # include <winsock2.h>
 #endif
 #if HAVE_WS2TCPIP_H
Index: ccvs/lib/time_r.c
diff -u ccvs/lib/time_r.c:1.3 ccvs/lib/time_r.c:1.4
--- ccvs/lib/time_r.c:1.3       Mon Sep 19 21:26:14 2005
+++ ccvs/lib/time_r.c   Mon Mar 20 02:21:56 2006
@@ -1,6 +1,6 @@
 /* Reentrant time functions like localtime_r.
 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 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
@@ -44,18 +44,6 @@
 }
 
 
-char *
-asctime_r (struct tm const * restrict tm, char * restrict buf)
-{
-  return copy_string_result (buf, asctime (tm));
-}
-
-char *
-ctime_r (time_t const *t, char *buf)
-{
-  return copy_string_result (buf, ctime (t));
-}
-
 struct tm *
 gmtime_r (time_t const * restrict t, struct tm * restrict tp)
 {
Index: ccvs/lib/time_r.h
diff -u ccvs/lib/time_r.h:1.3 ccvs/lib/time_r.h:1.4
--- ccvs/lib/time_r.h:1.3       Fri Aug 12 20:58:10 2005
+++ ccvs/lib/time_r.h   Mon Mar 20 02:21:56 2006
@@ -1,6 +1,6 @@
 /* Reentrant time functions like localtime_r.
 
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2006 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
@@ -27,25 +27,20 @@
 #include <time.h>
 
 #if !HAVE_TIME_R_POSIX
-# undef asctime_r
-# undef ctime_r
+
+/* Don't bother with asctime_r and ctime_r, since these functions are
+   not safe (like asctime and ctime, they can overrun their 26-byte
+   output buffers when given outlandish struct tm values), and we
+   don't want to encourage applications to use unsafe functions.  Use
+   strftime or even sprintf instead.  */
+
 # undef gmtime_r
 # undef localtime_r
 
-# define asctime_r rpl_asctime_r
-# define ctime_r rpl_ctime_r
 # define gmtime_r rpl_gmtime_r
 # define localtime_r rpl_localtime_r
 
 /* See the POSIX:2001 specification
-   <http://www.opengroup.org/susv3xsh/asctime.html>.  */
-char *asctime_r (struct tm const * restrict, char * restrict);
-
-/* See the POSIX:2001 specification
-   <http://www.opengroup.org/susv3xsh/ctime.html>.  */
-char *ctime_r (time_t const *, char *);
-
-/* See the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/gmtime.html>.  */
 struct tm *gmtime_r (time_t const * restrict, struct tm * restrict);
 
Index: ccvs/lib/unsetenv.c
diff -u ccvs/lib/unsetenv.c:1.2 ccvs/lib/unsetenv.c:1.3
--- ccvs/lib/unsetenv.c:1.2     Mon May 23 17:44:33 2005
+++ ccvs/lib/unsetenv.c Mon Mar 20 02:21:56 2006
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2002,2005 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
@@ -29,9 +29,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#if _LIBC || HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #if !_LIBC
 # define __environ     environ
Index: ccvs/lib/xalloc-die.c
diff -u ccvs/lib/xalloc-die.c:1.3 ccvs/lib/xalloc-die.c:1.4
--- ccvs/lib/xalloc-die.c:1.3   Mon Sep 19 21:26:14 2005
+++ ccvs/lib/xalloc-die.c       Mon Mar 20 02:21:56 2006
@@ -1,6 +1,6 @@
 /* Report a memory allocation failure and exit.
 
-   Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004 Free
+   Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2006 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,6 @@
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
 
 void
 xalloc_die (void)
Index: ccvs/m4/ChangeLog
diff -u ccvs/m4/ChangeLog:1.157 ccvs/m4/ChangeLog:1.158
--- ccvs/m4/ChangeLog:1.157     Fri Jan 27 07:38:46 2006
+++ ccvs/m4/ChangeLog   Mon Mar 20 02:21:56 2006
@@ -1,3 +1,9 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * clock_time.m4, extensions.m4, getaddrinfo.m4, gnulib-comp.m4,
+       nanosleep.m4, regex.m4, socklen.m4, sys_socket_h.m4, timespec.m4,
+       unistd_h.m4: Update from GNULIB.
+
 2006-01-26  Mark D. Baushke  <address@hidden>
 
        * stdbool.m4: Update from GNULIB.
Index: ccvs/m4/clock_time.m4
diff -u ccvs/m4/clock_time.m4:1.3 ccvs/m4/clock_time.m4:1.4
--- ccvs/m4/clock_time.m4:1.3   Tue May  3 14:58:58 2005
+++ ccvs/m4/clock_time.m4       Mon Mar 20 02:21:56 2006
@@ -1,5 +1,5 @@
-# clock_time.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# clock_time.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.
@@ -7,8 +7,8 @@
 # Check for clock_gettime and clock_settime, and sets LIB_CLOCK_GETTIME.
 AC_DEFUN([gl_CLOCK_TIME],
 [
-  # dnl Persuade glibc <time.h> to declare these functions.
-  AC_REQUIRE([AC_GNU_SOURCE])
+  dnl Persuade glibc and Solaris <time.h> to declare these functions.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
   # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function.
   # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
Index: ccvs/m4/extensions.m4
diff -u ccvs/m4/extensions.m4:1.3 ccvs/m4/extensions.m4:1.4
--- ccvs/m4/extensions.m4:1.3   Wed May 25 19:52:31 2005
+++ ccvs/m4/extensions.m4       Mon Mar 20 02:21:56 2006
@@ -1,6 +1,6 @@
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -25,6 +25,15 @@
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif])
-  AC_DEFINE([__EXTENSIONS__])
+  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
+    [ac_cv_safe_to_define___extensions__],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([
+         #define __EXTENSIONS__ 1
+         AC_INCLUDES_DEFAULT])],
+       [ac_cv_safe_to_define___extensions__=yes],
+       [ac_cv_safe_to_define___extensions__=no])])
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    AC_DEFINE([__EXTENSIONS__])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
 ])
Index: ccvs/m4/getaddrinfo.m4
diff -u ccvs/m4/getaddrinfo.m4:1.3 ccvs/m4/getaddrinfo.m4:1.4
--- ccvs/m4/getaddrinfo.m4:1.3  Thu Oct 20 21:08:46 2005
+++ ccvs/m4/getaddrinfo.m4      Mon Mar 20 02:21:56 2006
@@ -1,36 +1,75 @@
-# getaddrinfo.m4 serial 7
-dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# getaddrinfo.m4 serial 9
+dnl Copyright (C) 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_GETADDRINFO],
 [
+  AC_MSG_NOTICE([checking how to do getaddrinfo])
+
   AC_SEARCH_LIBS(getaddrinfo, [nsl socket])
-  AC_SEARCH_LIBS(gethostbyname, [inet nsl])
-  AC_SEARCH_LIBS(getservbyname, [inet nsl socket xnet])
-  AC_REPLACE_FUNCS(getaddrinfo gai_strerror)
+  AC_CHECK_FUNCS(getaddrinfo,, [
+    AC_CACHE_CHECK(for getaddrinfo in ws2tcpip.h and -lws2_32,
+                  gl_cv_w32_getaddrinfo, [
+      gl_cv_w32_getaddrinfo=no
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -lws2_32"
+      AC_TRY_LINK([
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
+], [getaddrinfo(0, 0, 0, 0);], gl_cv_w32_getaddrinfo=yes)
+    LIBS="$am_save_LIBS"])
+    if test "$gl_cv_w32_getaddrinfo" = "yes"; then
+      LIBS="$LIBS -lws2_32"
+    else
+      AC_LIBOBJ(getaddrinfo)
+    fi
+    ])
+
+  AC_REPLACE_FUNCS(gai_strerror)
   gl_PREREQ_GETADDRINFO
 ])
 
 # Prerequisites of lib/getaddrinfo.h and lib/getaddrinfo.c.
 AC_DEFUN([gl_PREREQ_GETADDRINFO], [
+  AC_SEARCH_LIBS(gethostbyname, [inet nsl])
+  AC_SEARCH_LIBS(getservbyname, [inet nsl socket xnet])
   AC_REQUIRE([gl_C_RESTRICT])
   AC_REQUIRE([gl_SOCKET_FAMILIES])
+  AC_REQUIRE([gl_HEADER_SYS_SOCKET])
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_GNU_SOURCE])
-  AC_CHECK_HEADERS_ONCE(netinet/in.h)
+  AC_CHECK_HEADERS_ONCE(netinet/in.h netdb.h)
   AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror],,,[
   /* sys/types.h is not needed according to POSIX, but the
      sys/socket.h in i386-unknown-freebsd4.10 and
      powerpc-apple-darwin5.5 required it. */
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
 ])
   AC_CHECK_TYPES([struct addrinfo],,,[
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#define WINVER 0x0501
+#include <ws2tcpip.h>
+#endif
 ])
 ])
Index: ccvs/m4/gnulib-comp.m4
diff -u ccvs/m4/gnulib-comp.m4:1.11 ccvs/m4/gnulib-comp.m4:1.12
--- ccvs/m4/gnulib-comp.m4:1.11 Wed Jan 25 12:53:43 2006
+++ ccvs/m4/gnulib-comp.m4      Mon Mar 20 02:21:56 2006
@@ -106,6 +106,7 @@
   gl_TIME_R
   gl_TIMESPEC
   gl_FUNC_TZSET_CLOBBER
+  gl_HEADER_UNISTD
   gl_UNISTD_SAFER
   gl_FUNC_GLIBC_UNLOCKED_IO
   gl_FUNC_VASNPRINTF
@@ -403,6 +404,7 @@
   m4/uintmax_t.m4
   m4/ulonglong.m4
   m4/unistd-safer.m4
+  m4/unistd_h.m4
   m4/unlocked-io.m4
   m4/vasnprintf.m4
   m4/vasprintf.m4
Index: ccvs/m4/nanosleep.m4
diff -u ccvs/m4/nanosleep.m4:1.5 ccvs/m4/nanosleep.m4:1.6
--- ccvs/m4/nanosleep.m4:1.5    Tue Oct  4 02:33:12 2005
+++ ccvs/m4/nanosleep.m4        Mon Mar 20 02:21:56 2006
@@ -1,11 +1,13 @@
-#serial 14
+#serial 15
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
 dnl If not found, use the supplied replacement.
 dnl
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, 
Inc.
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
+
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -26,6 +28,9 @@
  AC_CACHE_CHECK([whether nanosleep works],
   jm_cv_func_nanosleep_works,
   [
+   dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
+   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
    AC_REQUIRE([AC_HEADER_TIME])
    AC_CHECK_HEADERS_ONCE(sys/time.h)
    AC_TRY_RUN([
Index: ccvs/m4/regex.m4
diff -u ccvs/m4/regex.m4:1.7 ccvs/m4/regex.m4:1.8
--- ccvs/m4/regex.m4:1.7        Wed Dec  7 10:50:43 2005
+++ ccvs/m4/regex.m4    Mon Mar 20 02:21:56 2006
@@ -1,7 +1,7 @@
-#serial 31
+#serial 33
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free
-# Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,31 +14,6 @@
 
 AC_DEFUN([gl_REGEX],
 [
-  AC_REQUIRE([AC_SYS_LARGEFILE]) dnl for a sufficently-wide off_t
-
-  AC_CACHE_CHECK([whether off_t can be used in a switch statement],
-    [gl_cv_type_off_t_switch],
-    [AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM(
-         [AC_INCLUDES_DEFAULT],
-        [[off_t o = -1;
-          switch (o)
-            {
-            case -2:
-              return 1;
-            case -1:
-              return 2;
-            default:
-              return 0;
-            }
-        ]])],
-      [gl_cv_type_off_t_switch=yes],
-      [gl_cv_type_off_t_switch=no])])
-  if test $gl_cv_type_off_t_switch = yes; then
-    AC_DEFINE([_REGEX_LARGE_OFFSETS], 1,
-      [Define if you want regoff_t to be at least as wide POSIX requires.])
-  fi
-
   AC_LIBSOURCES(
     [regcomp.c, regex.c, regex.h,
      regex_internal.c, regex_internal.h, regexec.c])
@@ -123,10 +98,10 @@
              exit (1);
 
            /* Reject hosts whose regoff_t values are too narrow.
-              These include glibc 2.3.5 on hosts with 64-bit off_t
-              and 32-bit int, and Solaris 10 on hosts with 32-bit int
-              and _FILE_OFFSET_BITS=64.  */
-           if (sizeof (regoff_t) < sizeof (off_t))
+              These include glibc 2.3.5 on hosts with 64-bit ptrdiff_t
+              and 32-bit int.  */
+           if (sizeof (regoff_t) < sizeof (ptrdiff_t)
+               || sizeof (regoff_t) < sizeof (ssize_t))
              exit (1);
 
            exit (0);]])],
@@ -141,6 +116,8 @@
   esac
 
   if test $ac_use_included_regex = yes; then
+    AC_DEFINE([_REGEX_LARGE_OFFSETS], 1,
+      [Define if you want regoff_t to be at least as wide POSIX requires.])
     AC_DEFINE([re_syntax_options], [rpl_re_syntax_options],
       [Define to rpl_re_syntax_options if the replacement should be used.])
     AC_DEFINE([re_set_syntax], [rpl_re_set_syntax],
Index: ccvs/m4/socklen.m4
diff -u ccvs/m4/socklen.m4:1.3 ccvs/m4/socklen.m4:1.4
--- ccvs/m4/socklen.m4:1.3      Wed Jan 25 12:53:43 2006
+++ ccvs/m4/socklen.m4  Mon Mar 20 02:21:56 2006
@@ -1,4 +1,4 @@
-# socklen.m4 serial 3
+# socklen.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,
@@ -13,40 +13,40 @@
 
 dnl On mingw32, socklen_t is in ws2tcpip.h ('int'), so we try to find
 dnl it there first.  That file is included by gnulib's socket_.h, which
-dnl all users of this module should include.
+dnl all users of this module should include.  Cygwin must not include
+dnl ws2tcpip.h.
 AC_DEFUN([gl_TYPE_SOCKLEN_T],
-  [AC_CHECK_HEADERS_ONCE([sys/socket.h ws2tcpip.h])
+  [AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl
    AC_CHECK_TYPE([socklen_t], ,
      [AC_MSG_CHECKING([for socklen_t equivalent])
       AC_CACHE_VAL([gl_cv_gl_cv_socklen_t_equiv],
-        [# Systems have either "struct sockaddr *" or
-         # "void *" as the second argument to getpeername
-         gl_cv_socklen_t_equiv=
-         for arg2 in "struct sockaddr" void; do
+       [# Systems have either "struct sockaddr *" or
+        # "void *" as the second argument to getpeername
+        gl_cv_socklen_t_equiv=
+        for arg2 in "struct sockaddr" void; do
           for t in int size_t "unsigned int" "long int" "unsigned long int"; do
             AC_TRY_COMPILE(
               [#include <sys/types.h>
-                #include <sys/socket.h>
+               #include <sys/socket.h>
 
                int getpeername (int, $arg2 *, $t *);],
-               [$t len;
+              [$t len;
                getpeername (0, 0, &len);],
               [gl_cv_socklen_t_equiv="$t"])
-             test "$gl_cv_socklen_t_equiv" != "" && break
+            test "$gl_cv_socklen_t_equiv" != "" && break
           done
-           test "$gl_cv_socklen_t_equiv" != "" && break
-         done
+          test "$gl_cv_socklen_t_equiv" != "" && break
+        done
       ])
       if test "$gl_cv_socklen_t_equiv" = ""; then
        AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
       fi
       AC_MSG_RESULT([$gl_cv_socklen_t_equiv])
       AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],
-        [type to use in place of socklen_t if not defined])],
+       [type to use in place of socklen_t if not defined])],
      [#include <sys/types.h>
       #if HAVE_SYS_SOCKET_H
       # include <sys/socket.h>
-      #endif
-      #if HAVE_WS2TCPIP_H
+      #elif HAVE_WS2TCPIP_H
       # include <ws2tcpip.h>
       #endif])])
Index: ccvs/m4/sys_socket_h.m4
diff -u ccvs/m4/sys_socket_h.m4:1.1 ccvs/m4/sys_socket_h.m4:1.2
--- ccvs/m4/sys_socket_h.m4:1.1 Wed Jan 25 12:53:43 2006
+++ ccvs/m4/sys_socket_h.m4     Mon Mar 20 02:21:56 2006
@@ -1,4 +1,4 @@
-# sys_socket_h.m4 serial 1
+# sys_socket_h.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,
@@ -12,7 +12,11 @@
   if test $ac_cv_header_sys_socket_h = yes; then
     SYS_SOCKET_H=''
   else
-    AC_CHECK_HEADERS_ONCE([winsock2.h ws2tcpip.h])
+    dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
+    dnl the check for those headers unconditional; yet cygwin reports
+    dnl that the headers are present but cannot be compiled (since on
+    dnl cygwin, all socket information should come from sys/socket.h).
+    AC_CHECK_HEADERS([winsock2.h ws2tcpip.h])
     SYS_SOCKET_H='sys/socket.h'
   fi
   AC_SUBST(SYS_SOCKET_H)
Index: ccvs/m4/timespec.m4
diff -u ccvs/m4/timespec.m4:1.4 ccvs/m4/timespec.m4:1.5
--- ccvs/m4/timespec.m4:1.4     Mon Sep 19 16:28:07 2005
+++ ccvs/m4/timespec.m4 Mon Mar 20 02:21:56 2006
@@ -1,6 +1,8 @@
-#serial 11
+#serial 12
+
+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
 
-# Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +19,8 @@
   AC_CHECK_HEADERS_ONCE(sys/time.h)
   gl_CHECK_TYPE_STRUCT_TIMESPEC
 
-  dnl Persuade glibc <time.h> to declare nanosleep().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
   AC_CHECK_DECLS(nanosleep, , , [#include <time.h>])
 ])
Index: ccvs/maint-aux/Makefile.in
diff -u ccvs/maint-aux/Makefile.in:1.21 ccvs/maint-aux/Makefile.in:1.22
--- ccvs/maint-aux/Makefile.in:1.21     Wed Jan 25 12:53:54 2006
+++ ccvs/maint-aux/Makefile.in  Mon Mar 20 02:21:56 2006
@@ -114,12 +114,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -214,6 +214,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/man/Makefile.in
diff -u ccvs/man/Makefile.in:1.93 ccvs/man/Makefile.in:1.94
--- ccvs/man/Makefile.in:1.93   Wed Jan 25 12:53:55 2006
+++ ccvs/man/Makefile.in        Mon Mar 20 02:21:56 2006
@@ -116,12 +116,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -221,6 +221,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3358 ccvs/src/ChangeLog:1.3359
--- ccvs/src/ChangeLog:1.3358   Fri Mar 10 16:29:34 2006
+++ ccvs/src/ChangeLog  Mon Mar 20 02:21:57 2006
@@ -1,3 +1,7 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in: Regenerated.
+
 2006-03-07  Derek Price  <address@hidden>
 
        * tag.c (rtag_proc): Search the Attic when -F is used.
Index: ccvs/src/Makefile.in
diff -u ccvs/src/Makefile.in:1.164 ccvs/src/Makefile.in:1.165
--- ccvs/src/Makefile.in:1.164  Wed Jan 25 12:53:55 2006
+++ ccvs/src/Makefile.in        Mon Mar 20 02:21:57 2006
@@ -120,12 +120,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -256,6 +256,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/tools/ChangeLog
diff -u ccvs/tools/ChangeLog:1.39 ccvs/tools/ChangeLog:1.40
--- ccvs/tools/ChangeLog:1.39   Thu Sep  1 18:28:31 2005
+++ ccvs/tools/ChangeLog        Mon Mar 20 02:21:57 2006
@@ -1,3 +1,7 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in: Regenerated
+
 2005-03-22  Mark D. Baushke  <address@hidden>
 
        * Makefile.in: Regenerated.
Index: ccvs/tools/Makefile.in
diff -u ccvs/tools/Makefile.in:1.83 ccvs/tools/Makefile.in:1.84
--- ccvs/tools/Makefile.in:1.83 Wed Jan 25 12:53:55 2006
+++ ccvs/tools/Makefile.in      Mon Mar 20 02:21:57 2006
@@ -117,12 +117,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -217,6 +217,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/vms/ChangeLog
diff -u ccvs/vms/ChangeLog:1.106 ccvs/vms/ChangeLog:1.107
--- ccvs/vms/ChangeLog:1.106    Wed Nov  9 15:46:10 2005
+++ ccvs/vms/ChangeLog  Mon Mar 20 02:21:57 2006
@@ -1,3 +1,7 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in: Regeneated.
+
 2005-11-09  Derek Price  <address@hidden>
 
        * Makefile.am (stamp-ch): Sub PACKAGE_STRING & PACKAGE_BUGREPORT.
Index: ccvs/vms/Makefile.in
diff -u ccvs/vms/Makefile.in:1.86 ccvs/vms/Makefile.in:1.87
--- ccvs/vms/Makefile.in:1.86   Wed Jan 25 12:53:55 2006
+++ ccvs/vms/Makefile.in        Mon Mar 20 02:21:57 2006
@@ -120,12 +120,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -220,6 +220,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/windows-NT/ChangeLog
diff -u ccvs/windows-NT/ChangeLog:1.348 ccvs/windows-NT/ChangeLog:1.349
--- ccvs/windows-NT/ChangeLog:1.348     Wed Jan 25 12:55:47 2006
+++ ccvs/windows-NT/ChangeLog   Mon Mar 20 02:21:57 2006
@@ -1,3 +1,7 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in, config.h, config.h.in, stamp-chi: Regenerated.
+
 2006-01-25  Mark D. Baushke  <address@hidden>
 
        * stdint.h, stdbool.h: Update from GNULIB.
Index: ccvs/windows-NT/Makefile.in
diff -u ccvs/windows-NT/Makefile.in:1.115 ccvs/windows-NT/Makefile.in:1.116
--- ccvs/windows-NT/Makefile.in:1.115   Wed Jan 25 12:53:55 2006
+++ ccvs/windows-NT/Makefile.in Mon Mar 20 02:21:57 2006
@@ -121,12 +121,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -230,6 +230,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/windows-NT/SCC/ChangeLog
diff -u ccvs/windows-NT/SCC/ChangeLog:1.54 ccvs/windows-NT/SCC/ChangeLog:1.55
--- ccvs/windows-NT/SCC/ChangeLog:1.54  Thu Sep  1 13:49:01 2005
+++ ccvs/windows-NT/SCC/ChangeLog       Mon Mar 20 02:21:57 2006
@@ -1,3 +1,7 @@
+2006-03-19  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in: Regenerated.
+
 2005-09-01  Derek Price  <address@hidden>
 
        * README: Update links and email addresses.
Index: ccvs/windows-NT/SCC/Makefile.in
diff -u ccvs/windows-NT/SCC/Makefile.in:1.77 
ccvs/windows-NT/SCC/Makefile.in:1.78
--- ccvs/windows-NT/SCC/Makefile.in:1.77        Wed Jan 25 12:53:55 2006
+++ ccvs/windows-NT/SCC/Makefile.in     Mon Mar 20 02:21:57 2006
@@ -118,12 +118,12 @@
        $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \
        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/uintmax_t.m4 \
        $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/unistd-safer.m4 \
-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vasnprintf.m4 \
-       $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/wchar_t.m4 \
-       $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xalloc.m4 \
-       $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xreadlink.m4 \
-       $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/yesno.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \
+       $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
+       $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+       $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \
+       $(top_srcdir)/m4/xreadlink.m4 $(top_srcdir)/m4/xsize.m4 \
+       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -218,6 +218,7 @@
 STRIP = @STRIP@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 TEXI2DVI = @TEXI2DVI@
+UNISTD_H = @UNISTD_H@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
Index: ccvs/windows-NT/config.h
diff -u ccvs/windows-NT/config.h:1.175 ccvs/windows-NT/config.h:1.176
--- ccvs/windows-NT/config.h:1.175      Mon Jan 30 23:19:38 2006
+++ ccvs/windows-NT/config.h    Mon Mar 20 02:21:57 2006
@@ -542,6 +542,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #define HAVE_NDIR_H 1
 
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
Index: ccvs/windows-NT/config.h.in
diff -u ccvs/windows-NT/config.h.in:1.103 ccvs/windows-NT/config.h.in:1.104
--- ccvs/windows-NT/config.h.in:1.103   Mon Jan 30 23:19:38 2006
+++ ccvs/windows-NT/config.h.in Mon Mar 20 02:21:57 2006
@@ -535,6 +535,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #define HAVE_NDIR_H 1
 
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
Index: ccvs/windows-NT/stamp-chi
diff -u ccvs/windows-NT/stamp-chi:1.89 ccvs/windows-NT/stamp-chi:1.90
--- ccvs/windows-NT/stamp-chi:1.89      Mon Jan 30 23:19:38 2006
+++ ccvs/windows-NT/stamp-chi   Mon Mar 20 02:21:57 2006
@@ -535,6 +535,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #define HAVE_NDIR_H 1
 
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]