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 config.h....


From: Mark D. Baushke
Subject: [Cvs-cvs] ccvs ChangeLog Makefile.in aclocal.m4 config.h....
Date: Mon, 21 Aug 2006 19:22:23 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Mark D. Baushke <mdb>   06/08/21 19:22:22

Modified files:
        .              : ChangeLog Makefile.in aclocal.m4 config.h.in 
                         configure 
        contrib        : Makefile.in 
        contrib/pam    : Makefile.in 
        diff           : Makefile.in 
        doc            : Makefile.in 
        doc/i18n       : Makefile.in 
        doc/i18n/pt_BR : Makefile.in 
        lib            : ChangeLog Makefile.am Makefile.gnulib 
                         Makefile.in __fpending.h cycle-check.h 
                         getndelim2.c mkdirat.c openat-priv.h openat.c 
                         openat.h regex_internal.h stat_.h stdint_.h 
                         strtoimax.c tempname.c 
        m4             : ChangeLog cycle-check.m4 gnulib-comp.m4 
                         mkstemp.m4 openat.m4 strtoimax.m4 strtoll.m4 
                         strtoull.m4 strtoumax.m4 
        maint-aux      : Makefile.in gnulib-filelist.txt 
        man            : Makefile.in 
        src            : Makefile.in 
        tools          : Makefile.in 
        vms            : Makefile.in 
        windows-NT     : ChangeLog Makefile.in config.h config.h.in 
                         config.h.in.in stamp-chi stdint.h 
        windows-NT/SCC : Makefile.in 
Added files:
        lib            : at-func.c fchmodat.c 
Removed files:
        m4             : strerror_r.m4 

Log message:
        * Makefile.in, aclocal.m4, config.h.in, configure: Regenerated.
        
        * contrib/Makefile.in: Regenerated.
        * contrib/pam/Makefile.in: Regenerated.
        
        * diff/Makefile.in: Regenerated.
        
        * doc/Makefile.in: Regenerated.
        * doc/i18n/Makefile.in: Regenerated.
        * doc/i18n/pt_BR/Makefile.in: Regenerated.
         
        * lib/Makefile.am: Import changes from...
        * lib/Makefile.gnulib: ...this regenerated file.
        * lib/__fpending.h, lib/cycle-check.h, lib/getndelim2.c, lib/mkdirat.c,
        lib/openat-priv.h, lib/openat.c, lib/openat.h, lib/regex_internal.h,
        lib/stat_.h, lib/trtoimax.c, lib/tempname.c: Update from GNULIB.
        * lib/at-func.c, fchmodat.c: New from GNULIB.
        * lib/stdint_.h: Local patch for VC6 compiler.
        
        * m4/cycle-check.m4, m4/gnulib-comp.m4, m4/mkstemp.m4, m4/openat.m4,
        m4/strtoimax.m4, m4/strtoll.m4, m4/strtoull.m4, m4/strtoumax.m4: Update
        from GNULIB.
        * m4/strerror_r.m4: Remove this file (per GNULIB update).
        
        * maint-aux/Makefile.in: Regenerated.
        * maint-aux/gnulib-filelist.txt: Update from GNULIB.
        
        * man/Makefile.in: Regenerated.
        
        * src/Makefile.in: Regenerated.
        
        * tools/Makefile.in: Regenerated.
        * vms/Makefile.in: Regenerated.
        
        * windows-NT/config.h.in.in: Updated based on ../config.h.in changes.
        * windows-NT/Makefile.in, windows-NT/config.h, windows-NT/config.h.in,
        windows-NT/stamp-chi, windows-NT/stdint.h: Regenerated.
        
        * windows-NT/SCC/Makefile.in: Regenerated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1338&r2=1.1339
http://cvs.savannah.gnu.org/viewcvs/ccvs/Makefile.in?cvsroot=cvs&r1=1.198&r2=1.199
http://cvs.savannah.gnu.org/viewcvs/ccvs/aclocal.m4?cvsroot=cvs&r1=1.160&r2=1.161
http://cvs.savannah.gnu.org/viewcvs/ccvs/config.h.in?cvsroot=cvs&r1=1.218&r2=1.219
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure?cvsroot=cvs&r1=1.475&r2=1.476
http://cvs.savannah.gnu.org/viewcvs/ccvs/contrib/Makefile.in?cvsroot=cvs&r1=1.137&r2=1.138
http://cvs.savannah.gnu.org/viewcvs/ccvs/contrib/pam/Makefile.in?cvsroot=cvs&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/ccvs/diff/Makefile.in?cvsroot=cvs&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/Makefile.in?cvsroot=cvs&r1=1.153&r2=1.154
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/i18n/Makefile.in?cvsroot=cvs&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/i18n/pt_BR/Makefile.in?cvsroot=cvs&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/ChangeLog?cvsroot=cvs&r1=1.544&r2=1.545
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.am?cvsroot=cvs&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.gnulib?cvsroot=cvs&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.in?cvsroot=cvs&r1=1.220&r2=1.221
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/__fpending.h?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/cycle-check.h?cvsroot=cvs&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/getndelim2.c?cvsroot=cvs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/mkdirat.c?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/openat-priv.h?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/openat.c?cvsroot=cvs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/openat.h?cvsroot=cvs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/regex_internal.h?cvsroot=cvs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/stat_.h?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/stdint_.h?cvsroot=cvs&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/strtoimax.c?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/tempname.c?cvsroot=cvs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/at-func.c?cvsroot=cvs&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/fchmodat.c?cvsroot=cvs&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/ChangeLog?cvsroot=cvs&r1=1.185&r2=1.186
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/cycle-check.m4?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/gnulib-comp.m4?cvsroot=cvs&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/mkstemp.m4?cvsroot=cvs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/openat.m4?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/strtoimax.m4?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/strtoll.m4?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/strtoull.m4?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/strtoumax.m4?cvsroot=cvs&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/strerror_r.m4?cvsroot=cvs&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/ccvs/maint-aux/Makefile.in?cvsroot=cvs&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/ccvs/maint-aux/gnulib-filelist.txt?cvsroot=cvs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/ccvs/man/Makefile.in?cvsroot=cvs&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/Makefile.in?cvsroot=cvs&r1=1.180&r2=1.181
http://cvs.savannah.gnu.org/viewcvs/ccvs/tools/Makefile.in?cvsroot=cvs&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/ccvs/vms/Makefile.in?cvsroot=cvs&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/ChangeLog?cvsroot=cvs&r1=1.386&r2=1.387
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/Makefile.in?cvsroot=cvs&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h?cvsroot=cvs&r1=1.207&r2=1.208
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h.in?cvsroot=cvs&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h.in.in?cvsroot=cvs&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/stamp-chi?cvsroot=cvs&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/stdint.h?cvsroot=cvs&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/SCC/Makefile.in?cvsroot=cvs&r1=1.92&r2=1.93

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1338
retrieving revision 1.1339
diff -u -b -r1.1338 -r1.1339
--- ChangeLog   16 Aug 2006 18:12:07 -0000      1.1338
+++ ChangeLog   21 Aug 2006 19:22:21 -0000      1.1339
@@ -1,3 +1,9 @@
+2006-08-21  Mark D. Baushke  <address@hidden>
+
+       * Makefile.in, aclocal.m4, config.h.in, configure,
+       maint-aux/Makefile.in: Regenerated.
+       * maint-aux/gnulib-filelist.txt: Update from GNULIB.
+
 2006-08-16  Mark D. Baushke  <address@hidden>
 
        * Makefile.in, aclocal.m4, config.h.in, configure,

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/Makefile.in,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- Makefile.in 16 Aug 2006 18:12:07 -0000      1.198
+++ Makefile.in 21 Aug 2006 19:22:21 -0000      1.199
@@ -132,15 +132,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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 \

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/aclocal.m4,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- aclocal.m4  16 Aug 2006 18:12:07 -0000      1.160
+++ aclocal.m4  21 Aug 2006 19:22:21 -0000      1.161
@@ -1046,7 +1046,6 @@
 m4_include([m4/timespec.m4])
 m4_include([m4/tm_gmtoff.m4])
 m4_include([m4/tzset.m4])
-m4_include([m4/uintmax_t.m4])
 m4_include([m4/ulonglong.m4])
 m4_include([m4/unistd-safer.m4])
 m4_include([m4/unistd_h.m4])

Index: config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/config.h.in,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- config.h.in 16 Aug 2006 18:12:07 -0000      1.218
+++ config.h.in 21 Aug 2006 19:22:21 -0000      1.219
@@ -522,6 +522,9 @@
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
+/* Define to 1 if you have the `lchmod' function. */
+#undef HAVE_LCHMOD
+
 /* Define to 1 if you have the `krb' library (-lkrb). */
 #undef HAVE_LIBKRB
 
@@ -889,9 +892,6 @@
 /* Define to 1 if you have the `tzset' function. */
 #undef HAVE_TZSET
 
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
 /* Define to 1 if you have the `uname' function. */
 #undef HAVE_UNAME
 
@@ -901,9 +901,6 @@
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
-
 /* Define to 1 if the system has the type `unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
@@ -1396,7 +1393,7 @@
 #undef inline
 #endif
 
-/* Define to long or long long if <stdint.h> and <inttypes.h> don't define. */
+/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
 #undef intmax_t
 
 /* Define to rpl_localtime if the replacement function should be used. */
@@ -1514,9 +1511,5 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t
 
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-#undef uintmax_t
-
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork

Index: configure
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -b -r1.475 -r1.476
--- configure   16 Aug 2006 18:12:07 -0000      1.475
+++ configure   21 Aug 2006 19:22:21 -0000      1.476
@@ -1908,6 +1908,7 @@
 ac_header_list="$ac_header_list sys/socket.h"
 ac_header_list="$ac_header_list netinet/in.h"
 ac_header_list="$ac_header_list netdb.h"
+ac_func_list="$ac_func_list lchmod"
 ac_func_list="$ac_func_list fdopendir"
 ac_func_list="$ac_func_list fchdir"
 ac_func_list="$ac_func_list mempcpy"
@@ -12886,6 +12887,8 @@
 
 
 
+
+
   case " $LIBOBJS " in
   *" save-cwd.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS save-cwd.$ac_objext"
@@ -12986,277 +12989,6 @@
 
 
 
-  { echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
-if test "${gl_cv_header_inttypes_h+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.  */
-#include <sys/types.h>
-#include <inttypes.h>
-int
-main ()
-{
-uintmax_t i = (uintmax_t) -1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gl_cv_header_inttypes_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       gl_cv_header_inttypes_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6; }
-  if test $gl_cv_header_inttypes_h = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-_ACEOF
-
-  fi
-
-
-  { echo "$as_me:$LINENO: checking for stdint.h" >&5
-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
-if test "${gl_cv_header_stdint_h+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.  */
-#include <sys/types.h>
-#include <stdint.h>
-int
-main ()
-{
-uintmax_t i = (uintmax_t) -1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gl_cv_header_stdint_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       gl_cv_header_stdint_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
-echo "${ECHO_T}$gl_cv_header_stdint_h" >&6; }
-  if test $gl_cv_header_stdint_h = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STDINT_H_WITH_UINTMAX 1
-_ACEOF
-
-  fi
-
-
-  { echo "$as_me:$LINENO: checking for unsigned long long int" >&5
-echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6; }
-if test "${ac_cv_type_unsigned_long_long_int+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.  */
-unsigned long long int ull = 18446744073709551615ULL;
-           typedef int a[(18446744073709551615ULL <= (unsigned long long int) 
-1
-                          ? 1 : -1)];
-          int i = 63;
-int
-main ()
-{
-unsigned long long int ullmax = 18446744073709551615ull;
-           return (ull << 63 | ull >> 63 | ull << i | ull >> i
-                   | ullmax / ull | ullmax % ull);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_unsigned_long_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_unsigned_long_long_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6; }
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-_ACEOF
-
-  fi
-
-
-
-  ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
-  if test $ac_cv_type_unsigned_long_long = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNSIGNED_LONG_LONG 1
-_ACEOF
-
-  fi
-
-
-
-
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; 
then
-
-    test $ac_cv_type_unsigned_long_long = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-
-cat >>confdefs.h <<_ACEOF
-#define uintmax_t $ac_type
-_ACEOF
-
-  else
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINTMAX_T 1
-_ACEOF
-
-  fi
-
-
-
-
-
-
-
-
     { echo "$as_me:$LINENO: checking whether system is Windows or MSDOS" >&5
 echo $ECHO_N "checking whether system is Windows or MSDOS... $ECHO_C" >&6; }
 if test "${ac_cv_win_or_dos+set}" = set; then
@@ -14057,87 +13789,6 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking for d_ino member in directory struct" >&5
-echo $ECHO_N "checking for d_ino member in directory struct... $ECHO_C" >&6; }
-if test "${jm_cv_struct_dirent_d_ino+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.  */
-
-#include <sys/types.h>
-#include <dirent.h>
-
-int
-main ()
-{
-struct dirent dp; dp.d_ino = 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  jm_cv_struct_dirent_d_ino=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       jm_cv_struct_dirent_d_ino=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
-
-fi
-{ echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_ino" >&5
-echo "${ECHO_T}$jm_cv_struct_dirent_d_ino" >&6; }
-   if test $jm_cv_struct_dirent_d_ino = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define D_INO_IN_DIRENT 1
-_ACEOF
-
-   fi
-
-
 { echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be 
included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... 
$ECHO_C" >&6; }
 if test "${ac_cv_header_time+set}" = set; then
@@ -16406,87 +16057,6 @@
 
 
 
-{ echo "$as_me:$LINENO: checking for d_type member in directory struct" >&5
-echo $ECHO_N "checking for d_type member in directory struct... $ECHO_C" >&6; }
-if test "${jm_cv_struct_dirent_d_type+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.  */
-
-#include <sys/types.h>
-#include <dirent.h>
-
-int
-main ()
-{
-struct dirent dp; dp.d_type = 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  jm_cv_struct_dirent_d_type=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       jm_cv_struct_dirent_d_type=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
-
-fi
-{ echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_type" >&5
-echo "${ECHO_T}$jm_cv_struct_dirent_d_type" >&6; }
-   if test $jm_cv_struct_dirent_d_type = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_DIRENT_D_TYPE 1
-_ACEOF
-
-   fi
-
-
 
 
 
@@ -18653,6 +18223,87 @@
 
 
 
+  { echo "$as_me:$LINENO: checking for unsigned long long int" >&5
+echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6; }
+if test "${ac_cv_type_unsigned_long_long_int+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.  */
+unsigned long long int ull = 18446744073709551615ULL;
+           typedef int a[(18446744073709551615ULL <= (unsigned long long int) 
-1
+                          ? 1 : -1)];
+          int i = 63;
+int
+main ()
+{
+unsigned long long int ullmax = 18446744073709551615ull;
+           return (ull << 63 | ull >> 63 | ull << i | ull >> i
+                   | ullmax / ull | ullmax % ull);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_unsigned_long_long_int=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_type_unsigned_long_long_int=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
+echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6; }
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UNSIGNED_LONG_LONG_INT 1
+_ACEOF
+
+  fi
+
+
 
 
 
@@ -20323,6 +19974,158 @@
 fi
 
 
+  { echo "$as_me:$LINENO: checking for inttypes.h" >&5
+echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
+if test "${gl_cv_header_inttypes_h+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.  */
+#include <sys/types.h>
+#include <inttypes.h>
+int
+main ()
+{
+uintmax_t i = (uintmax_t) -1;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gl_cv_header_inttypes_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       gl_cv_header_inttypes_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
+echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6; }
+  if test $gl_cv_header_inttypes_h = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
+_ACEOF
+
+  fi
+
+
+  { echo "$as_me:$LINENO: checking for stdint.h" >&5
+echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
+if test "${gl_cv_header_stdint_h+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.  */
+#include <sys/types.h>
+#include <stdint.h>
+int
+main ()
+{
+uintmax_t i = (uintmax_t) -1;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gl_cv_header_stdint_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       gl_cv_header_stdint_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
+echo "${ECHO_T}$gl_cv_header_stdint_h" >&6; }
+  if test $gl_cv_header_stdint_h = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STDINT_H_WITH_UINTMAX 1
+_ACEOF
+
+  fi
+
+
 
 
   { echo "$as_me:$LINENO: checking for intmax_t" >&5
@@ -21123,13 +20926,20 @@
 
 
 
-  # No system provides a mkdirat function; compile it unconditionally.
+
+  # No system provides these functions; compile them unconditionally.
   case " $LIBOBJS " in
   *" mkdirat.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS mkdirat.$ac_objext"
  ;;
 esac
 
+  case " $LIBOBJS " in
+  *" fchmodat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS fchmodat.$ac_objext"
+ ;;
+esac
+
 
   case " $LIBOBJS " in
   *" openat-die.$ac_objext "* ) ;;
@@ -21145,6 +20955,12 @@
 
 
 
+
+
+
+
+
+
 for ac_func in openat
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -21433,7 +21249,6 @@
     :
 
 
-
   case " $LIBOBJS " in
   *" cycle-check.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS cycle-check.$ac_objext"
@@ -21441,8 +21256,166 @@
 esac
 
 
+  { echo "$as_me:$LINENO: checking for d_ino member in directory struct" >&5
+echo $ECHO_N "checking for d_ino member in directory struct... $ECHO_C" >&6; }
+if test "${jm_cv_struct_dirent_d_ino+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.  */
+
+#include <sys/types.h>
+#include <dirent.h>
+
+int
+main ()
+{
+struct dirent dp; dp.d_ino = 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  jm_cv_struct_dirent_d_ino=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       jm_cv_struct_dirent_d_ino=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_ino" >&5
+echo "${ECHO_T}$jm_cv_struct_dirent_d_ino" >&6; }
+   if test $jm_cv_struct_dirent_d_ino = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define D_INO_IN_DIRENT 1
+_ACEOF
+
+   fi
+
+
+  { echo "$as_me:$LINENO: checking for d_type member in directory struct" >&5
+echo $ECHO_N "checking for d_type member in directory struct... $ECHO_C" >&6; }
+if test "${jm_cv_struct_dirent_d_type+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.  */
+
+#include <sys/types.h>
+#include <dirent.h>
+
+int
+main ()
+{
+struct dirent dp; dp.d_type = 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  jm_cv_struct_dirent_d_type=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       jm_cv_struct_dirent_d_type=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_type" >&5
+echo "${ECHO_T}$jm_cv_struct_dirent_d_type" >&6; }
+   if test $jm_cv_struct_dirent_d_type = yes; then
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_DIRENT_D_TYPE 1
+_ACEOF
 
+   fi
 
 
 
@@ -28836,7 +28809,6 @@
 done
 
 
-
   fi
 
 
@@ -29100,13 +29072,20 @@
 
 
 
-  # No system provides a mkdirat function; compile it unconditionally.
+
+  # No system provides these functions; compile them unconditionally.
   case " $LIBOBJS " in
   *" mkdirat.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS mkdirat.$ac_objext"
  ;;
 esac
 
+  case " $LIBOBJS " in
+  *" fchmodat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS fchmodat.$ac_objext"
+ ;;
+esac
+
 
   case " $LIBOBJS " in
   *" openat-die.$ac_objext "* ) ;;
@@ -29122,6 +29101,12 @@
 
 
 
+
+
+
+
+
+
 for ac_func in openat
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -34635,27 +34620,6 @@
 
     if test $ac_cv_func_strtoimax = no; then
 
-
-
-
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; 
then
-
-    test $ac_cv_type_long_long = yes \
-      && ac_type='long long' \
-      || ac_type='long'
-
-cat >>confdefs.h <<_ACEOF
-#define intmax_t $ac_type
-_ACEOF
-
-  else
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INTMAX_T 1
-_ACEOF
-
-  fi
-
   { echo "$as_me:$LINENO: checking whether strtoll is declared" >&5
 echo $ECHO_N "checking whether strtoll is declared... $ECHO_C" >&6; }
 if test "${ac_cv_have_decl_strtoll+set}" = set; then
@@ -34869,7 +34833,7 @@
 
 
 
-  if test "$ac_cv_type_long_long" = yes; then
+  if test "$ac_cv_type_long_long_int" = yes; then
 
 for ac_func in strtoll
 do
@@ -35117,7 +35081,7 @@
 
 
 
-  if test "$ac_cv_type_unsigned_long_long" = yes; then
+  if test "$ac_cv_type_unsigned_long_long_int" = yes; then
 
 for ac_func in strtoull
 do
@@ -35396,27 +35360,6 @@
 
     if test $ac_cv_func_strtoumax = no; then
 
-
-
-
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; 
then
-
-    test $ac_cv_type_unsigned_long_long = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-
-cat >>confdefs.h <<_ACEOF
-#define uintmax_t $ac_type
-_ACEOF
-
-  else
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINTMAX_T 1
-_ACEOF
-
-  fi
-
   { echo "$as_me:$LINENO: checking whether strtoull is declared" >&5
 echo $ECHO_N "checking whether strtoull is declared... $ECHO_C" >&6; }
 if test "${ac_cv_have_decl_strtoull+set}" = set; then
@@ -39643,6 +39586,27 @@
 
 
 
+  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; 
then
+
+    test $ac_cv_type_long_long = yes \
+      && ac_type='long long' \
+      || ac_type='long'
+
+cat >>confdefs.h <<_ACEOF
+#define intmax_t $ac_type
+_ACEOF
+
+  else
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INTMAX_T 1
+_ACEOF
+
+  fi
+
+
+
+
 
 
 

Index: contrib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/Makefile.in,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- contrib/Makefile.in 16 Aug 2006 18:12:08 -0000      1.137
+++ contrib/Makefile.in 21 Aug 2006 19:22:21 -0000      1.138
@@ -134,15 +134,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: contrib/pam/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/pam/Makefile.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- contrib/pam/Makefile.in     16 Aug 2006 18:12:08 -0000      1.58
+++ contrib/pam/Makefile.in     21 Aug 2006 19:22:21 -0000      1.59
@@ -121,15 +121,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: diff/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/diff/Makefile.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- diff/Makefile.in    16 Aug 2006 18:12:08 -0000      1.106
+++ diff/Makefile.in    21 Aug 2006 19:22:21 -0000      1.107
@@ -110,15 +110,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/Makefile.in,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- doc/Makefile.in     16 Aug 2006 18:12:08 -0000      1.153
+++ doc/Makefile.in     21 Aug 2006 19:22:21 -0000      1.154
@@ -128,15 +128,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: doc/i18n/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/i18n/Makefile.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- doc/i18n/Makefile.in        16 Aug 2006 18:12:08 -0000      1.41
+++ doc/i18n/Makefile.in        21 Aug 2006 19:22:21 -0000      1.42
@@ -120,15 +120,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: doc/i18n/pt_BR/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/i18n/pt_BR/Makefile.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- doc/i18n/pt_BR/Makefile.in  16 Aug 2006 18:12:08 -0000      1.42
+++ doc/i18n/pt_BR/Makefile.in  21 Aug 2006 19:22:22 -0000      1.43
@@ -120,15 +120,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: lib/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ChangeLog,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -b -r1.544 -r1.545
--- lib/ChangeLog       21 Aug 2006 10:08:18 -0000      1.544
+++ lib/ChangeLog       21 Aug 2006 19:22:22 -0000      1.545
@@ -1,5 +1,15 @@
 2006-08-21  Mark D. Baushke  <address@hidden>
 
+       * Makefile.am: Import changes from...
+       * Makefile.gnulib: ...this regenerated file.
+       * __fpending.h, cycle-check.h, getndelim2.c, mkdirat.c,
+       openat-priv.h, openat.c, openat.h, regex_internal.h, stat_.h,
+       trtoimax.c, tempname.c: Update from GNULIB.
+       * at-func.c, fchmodat.c: New from GNULIB.
+       * stdint_.h: Local patch for VC6 compiler.
+
+2006-08-21  Mark D. Baushke  <address@hidden>
+
        * libcvs.dsp (SOURCE): Add a close-stream.c entry.
        * libcvs.dep: Ditto.
 

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.am,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- lib/Makefile.am     16 Aug 2006 18:12:09 -0000      1.119
+++ lib/Makefile.am     21 Aug 2006 19:22:22 -0000      1.120
@@ -105,6 +105,12 @@
 
 ## end   gnulib module base64
 
+## begin gnulib module cycle-check
+
+libcvs_a_SOURCES += cycle-check.h
+
+## end   gnulib module cycle-check
+
 ## begin gnulib module dirname
 
 libcvs_a_SOURCES += basename.c stripslash.c

Index: lib/Makefile.gnulib
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.gnulib,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- lib/Makefile.gnulib 16 Aug 2006 18:12:09 -0000      1.82
+++ lib/Makefile.gnulib 21 Aug 2006 19:22:22 -0000      1.83
@@ -77,6 +77,12 @@
 
 ## end   gnulib module base64
 
+## begin gnulib module cycle-check
+
+libgnu_a_SOURCES += cycle-check.h
+
+## end   gnulib module cycle-check
+
 ## begin gnulib module dirname
 
 libgnu_a_SOURCES += basename.c stripslash.c

Index: lib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.in,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -b -r1.220 -r1.221
--- lib/Makefile.in     16 Aug 2006 18:12:09 -0000      1.220
+++ lib/Makefile.in     21 Aug 2006 19:22:22 -0000      1.221
@@ -57,11 +57,11 @@
 subdir = lib
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        ChangeLog __fpending.c __fpending.h alloca.c asnprintf.c \
-       asprintf.c atexit.c canon-host.c canon-host.h canonicalize.c \
-       canonicalize.h chdir-long.c chdir-long.h close-stream.c \
-       close-stream.h closeout.c closeout.h creat-safer.c \
-       cycle-check.c cycle-check.h dev-ino.h dirname.c dirname.h \
-       dup-safer.c dup2.c exitfail.c exitfail.h fcntl--.h \
+       asprintf.c at-func.c atexit.c canon-host.c canon-host.h \
+       canonicalize.c canonicalize.h chdir-long.c chdir-long.h \
+       close-stream.c close-stream.h closeout.c closeout.h \
+       creat-safer.c cycle-check.c dev-ino.h dirname.c dirname.h \
+       dup-safer.c dup2.c exitfail.c exitfail.h fchmodat.c fcntl--.h \
        fcntl-safer.h fd-safer.c filenamecat.c filenamecat.h fncase.c \
        fnmatch.c fseeko.c ftello.c ftruncate.c gai_strerror.c \
        getaddrinfo.c getcwd.c getcwd.h getdate.c getdate.h getdate.y \
@@ -156,15 +156,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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
@@ -384,13 +384,13 @@
 # with the diff library (perhaps to have the caller, CVS, do the
 # matching?)
 libcvs_a_SOURCES = sighandle.c system.h wait.h xselect.h xtime.h \
-       allocsa.h allocsa.c base64.h base64.c basename.c stripslash.c \
-       error.h exit.h getaddrinfo.h getnline.h getnline.c gettext.h \
-       inet_ntop.h mbchar.h mbuiter.h minmax.h setenv.h size_max.h \
-       snprintf.h strcase.h strnlen1.h strnlen1.c strstr.h \
-       printf-args.h printf-parse.h vasnprintf.h vasprintf.h verify.h \
-       wcwidth.h xalloc-die.c xgethostname.h xgethostname.c xsize.h \
-       xstrndup.h xstrndup.c
+       allocsa.h allocsa.c base64.h base64.c cycle-check.h basename.c \
+       stripslash.c error.h exit.h getaddrinfo.h getnline.h \
+       getnline.c gettext.h inet_ntop.h mbchar.h mbuiter.h minmax.h \
+       setenv.h size_max.h snprintf.h strcase.h strnlen1.h strnlen1.c \
+       strstr.h printf-args.h printf-parse.h vasnprintf.h vasprintf.h \
+       verify.h wcwidth.h xalloc-die.c xgethostname.h xgethostname.c \
+       xsize.h xstrndup.h xstrndup.c
 libcvs_a_LIBADD = @LIBOBJS@ @ALLOCA@
 BUILT_SOURCES = $(ALLOCA_H) $(ARPA_INET_H) $(FNMATCH_H) getdate.c \
        $(GETOPT_H) $(GLOB_H) $(NETINET_IN_H) $(STDBOOL_H) $(STDINT_H) \
@@ -484,6 +484,7 @@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
@@ -496,6 +497,7 @@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden(DEPDIR)/address@hidden@

Index: lib/__fpending.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/__fpending.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lib/__fpending.h    19 Sep 2005 21:26:13 -0000      1.2
+++ lib/__fpending.h    21 Aug 2006 19:22:22 -0000      1.3
@@ -1,3 +1,23 @@
+/* Declare __fpending.
+
+   Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+   Written by Jim Meyering.  */
+
 #include <stddef.h>
 #include <stdio.h>
 

Index: lib/cycle-check.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/cycle-check.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lib/cycle-check.h   6 Jul 2006 02:17:59 -0000       1.2
+++ lib/cycle-check.h   21 Aug 2006 19:22:22 -0000      1.3
@@ -22,12 +22,7 @@
 #ifndef CYCLE_CHECK_H
 # define CYCLE_CHECK_H 1
 
-# if HAVE_INTTYPES_H
-#  include <inttypes.h>
-# endif
-# if HAVE_STDINT_H
 #  include <stdint.h>
-# endif
 # include <stdbool.h>
 # include "dev-ino.h"
 # include "same-inode.h"

Index: lib/getndelim2.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getndelim2.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- lib/getndelim2.c    19 Sep 2005 21:26:13 -0000      1.9
+++ lib/getndelim2.c    21 Aug 2006 19:22:22 -0000      1.10
@@ -1,8 +1,8 @@
 /* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
    with bounded memory allocation.
 
-   Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003, 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
@@ -34,21 +34,7 @@
 #endif
 
 #include <limits.h>
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifndef PTRDIFF_MAX
-# define PTRDIFF_MAX ((ptrdiff_t) (SIZE_MAX / 2))
-#endif
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
-#ifndef SSIZE_MAX
-# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
-#endif
+#include <stdint.h>
 
 /* The maximum value that getndelim2 can return without suffering from
    overflow problems, either internally (because of pointer

Index: lib/mkdirat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mkdirat.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/mkdirat.c       25 Jan 2006 12:53:38 -0000      1.1
+++ lib/mkdirat.c       21 Aug 2006 19:22:22 -0000      1.2
@@ -23,17 +23,10 @@
 
 #include "openat.h"
 
-#include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
 
 #include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
 #include "save-cwd.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
 #include "openat-priv.h"
 
 /* Solaris 10 has no function like this.
@@ -42,47 +35,11 @@
    working directory.  Otherwise, resort to using save_cwd/fchdir,
    then mkdir/restore_cwd.  If either the save_cwd or the restore_cwd
    fails, then give a diagnostic and exit nonzero.  */
-int
-mkdirat (int fd, char const *file, mode_t mode)
-{
-  struct saved_cwd saved_cwd;
-  int saved_errno;
-  int err;
-
-  if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file))
-    return mkdir (file, mode);
-
-  {
-    char *proc_file;
-    BUILD_PROC_NAME (proc_file, fd, file);
-    err = mkdir (proc_file, mode);
-    /* If the syscall succeeds, or if it fails with an unexpected
-       errno value, then return right away.  Otherwise, fall through
-       and resort to using save_cwd/restore_cwd.  */
-    if (0 <= err || ! EXPECTED_ERRNO (errno))
-      return err;
-  }
-
-  if (save_cwd (&saved_cwd) != 0)
-    openat_save_fail (errno);
-
-  if (fchdir (fd) != 0)
-    {
-      saved_errno = errno;
-      free_cwd (&saved_cwd);
-      errno = saved_errno;
-      return -1;
-    }
-
-  err = mkdir (file, mode);
-  saved_errno = (err < 0 ? errno : 0);
-
-  if (restore_cwd (&saved_cwd) != 0)
-    openat_restore_fail (errno);
-
-  free_cwd (&saved_cwd);
 
-  if (saved_errno)
-    errno = saved_errno;
-  return err;
-}
+#define AT_FUNC_NAME mkdirat
+#define AT_FUNC_F1 mkdir
+#define AT_FUNC_F2 mkdir
+#define AT_FUNC_USE_F1_COND 1
+#define AT_FUNC_POST_FILE_PARAM_DECLS , mode_t mode
+#define AT_FUNC_POST_FILE_ARGS        , mode
+#include "at-func.c"

Index: lib/openat-priv.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/openat-priv.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- lib/openat-priv.h   25 Jan 2006 12:53:38 -0000      1.1
+++ lib/openat-priv.h   21 Aug 2006 19:22:22 -0000      1.2
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 #include "alloca.h"
 #include "intprops.h"
 
@@ -41,6 +42,16 @@
     }                                                                  \
   while (0)
 
+/* Some systems don't have ENOSYS.  */
+#ifndef ENOSYS
+# ifdef ENOTSUP
+#  define ENOSYS ENOTSUP
+# else
+/* Some systems don't have ENOTSUP either.  */
+#  define ENOSYS EINVAL
+# endif
+#endif
+
 /* Trying to access a BUILD_PROC_NAME file will fail on systems without
    /proc support, and even on systems *with* ProcFS support.  Return
    nonzero if the failure may be legitimate, e.g., because /proc is not

Index: lib/openat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/openat.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- lib/openat.c        22 Jun 2006 19:04:35 -0000      1.7
+++ lib/openat.c        21 Aug 2006 19:22:22 -0000      1.8
@@ -23,21 +23,20 @@
 
 #include "openat.h"
 
+#include <stdarg.h>
+#include <stddef.h>
+
 #include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
 #include "fcntl--.h"
+#include "lstat.h"
 #include "openat-priv.h"
 #include "save-cwd.h"
-#include "unistd--.h"
-
-#include <stdarg.h>
-#include <stddef.h>
-#include <errno.h>
 
 /* Replacement for Solaris' openat function.
    <http://www.google.com/search?q=openat+site:docs.sun.com>
-   Simulate it by doing save_cwd/fchdir/open/restore_cwd.
-   If either the save_cwd or the restore_cwd fails (relatively unlikely,
-   and usually indicative of a problem that deserves close attention),
+   First, try to simulate it via open ("/proc/self/fd/FD/FILE").
+   Failing that, simulate it by doing save_cwd/fchdir/open/restore_cwd.
+   If either the save_cwd or the restore_cwd fails (relatively unlikely),
    then give a diagnostic and exit nonzero.
    Otherwise, upon failure, set errno and return -1, as openat does.
    Upon successful completion, return a file descriptor.  */
@@ -126,13 +125,33 @@
   return err;
 }
 
+/* Return true if our openat implementation must resort to
+   using save_cwd and restore_cwd.  */
+bool
+openat_needs_fchdir (void)
+{
+  int fd2;
+  int fd = open ("/", O_RDONLY);
+  char *proc_file;
+
+  if (fd < 0)
+    return true;
+  BUILD_PROC_NAME (proc_file, fd, ".");
+  fd2 = open (proc_file, O_RDONLY);
+  close (fd);
+  if (0 <= fd2)
+    close (fd2);
+
+  return fd2 < 0;
+}
+
 #if !HAVE_FDOPENDIR
 
 /* Replacement for Solaris' function by the same name.
    <http://www.google.com/search?q=fdopendir+site:docs.sun.com>
-   Simulate it by doing save_cwd/fchdir/opendir(".")/restore_cwd.
-   If either the save_cwd or the restore_cwd fails (relatively unlikely,
-   and usually indicative of a problem that deserves close attention),
+   First, try to simulate it via opendir ("/proc/self/fd/FD").  Failing
+   that, simulate it by doing save_cwd/fchdir/opendir(".")/restore_cwd.
+   If either the save_cwd or the restore_cwd fails (relatively unlikely),
    then give a diagnostic and exit nonzero.
    Otherwise, this function works just like Solaris' fdopendir.
 
@@ -186,102 +205,60 @@
 
 /* Replacement for Solaris' function by the same name.
    <http://www.google.com/search?q=fstatat+site:docs.sun.com>
-   Simulate it by doing save_cwd/fchdir/(stat|lstat)/restore_cwd.
-   If either the save_cwd or the restore_cwd fails (relatively unlikely,
-   and usually indicative of a problem that deserves close attention),
+   First, try to simulate it via l?stat ("/proc/self/fd/FD/FILE").
+   Failing that, simulate it via save_cwd/fchdir/(stat|lstat)/restore_cwd.
+   If either the save_cwd or the restore_cwd fails (relatively unlikely),
    then give a diagnostic and exit nonzero.
    Otherwise, this function works just like Solaris' fstatat.  */
-int
-fstatat (int fd, char const *file, struct stat *st, int flag)
-{
-  struct saved_cwd saved_cwd;
-  int saved_errno;
-  int err;
-
-  if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file))
-    return (flag == AT_SYMLINK_NOFOLLOW
-           ? lstat (file, st)
-           : stat (file, st));
-
-  {
-    char *proc_file;
-    BUILD_PROC_NAME (proc_file, fd, file);
-    err = (flag == AT_SYMLINK_NOFOLLOW
-          ? lstat (proc_file, st)
-          : stat (proc_file, st));
-    /* If the syscall succeeds, or if it fails with an unexpected
-       errno value, then return right away.  Otherwise, fall through
-       and resort to using save_cwd/restore_cwd.  */
-    if (0 <= err || ! EXPECTED_ERRNO (errno))
-      return err;
-  }
-
-  if (save_cwd (&saved_cwd) != 0)
-    openat_save_fail (errno);
-
-  err = fchdir (fd);
-  saved_errno = errno;
-
-  if (! err)
-    {
-      err = (flag == AT_SYMLINK_NOFOLLOW
-            ? lstat (file, st)
-            : stat (file, st));
-      saved_errno = errno;
-
-      if (restore_cwd (&saved_cwd) != 0)
-       openat_restore_fail (errno);
-    }
 
-  free_cwd (&saved_cwd);
-  errno = saved_errno;
-  return err;
-}
+#define AT_FUNC_NAME fstatat
+#define AT_FUNC_F1 lstat
+#define AT_FUNC_F2 stat
+#define AT_FUNC_USE_F1_COND flag == AT_SYMLINK_NOFOLLOW
+#define AT_FUNC_POST_FILE_PARAM_DECLS , struct stat *st, int flag
+#define AT_FUNC_POST_FILE_ARGS        , st
+#include "at-func.c"
+#undef AT_FUNC_NAME
+#undef AT_FUNC_F1
+#undef AT_FUNC_F2
+#undef AT_FUNC_USE_F1_COND
+#undef AT_FUNC_POST_FILE_PARAM_DECLS
+#undef AT_FUNC_POST_FILE_ARGS
 
 /* Replacement for Solaris' function by the same name.
    <http://www.google.com/search?q=unlinkat+site:docs.sun.com>
-   Simulate it by doing save_cwd/fchdir/(unlink|rmdir)/restore_cwd.
-   If either the save_cwd or the restore_cwd fails (relatively unlikely,
-   and usually indicative of a problem that deserves close attention),
+   First, try to simulate it via (unlink|rmdir) ("/proc/self/fd/FD/FILE").
+   Failing that, simulate it via save_cwd/fchdir/(unlink|rmdir)/restore_cwd.
+   If either the save_cwd or the restore_cwd fails (relatively unlikely),
    then give a diagnostic and exit nonzero.
    Otherwise, this function works just like Solaris' unlinkat.  */
-int
-unlinkat (int fd, char const *file, int flag)
-{
-  struct saved_cwd saved_cwd;
-  int saved_errno;
-  int err;
-
-  if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file))
-    return (flag == AT_REMOVEDIR ? rmdir (file) : unlink (file));
-
-  {
-    char *proc_file;
-    BUILD_PROC_NAME (proc_file, fd, file);
-    err = (flag == AT_REMOVEDIR ? rmdir (proc_file) : unlink (proc_file));
-    /* If the syscall succeeds, or if it fails with an unexpected
-       errno value, then return right away.  Otherwise, fall through
-       and resort to using save_cwd/restore_cwd.  */
-    if (0 <= err || ! EXPECTED_ERRNO (errno))
-      return err;
-  }
 
-  if (save_cwd (&saved_cwd) != 0)
-    openat_save_fail (errno);
+#define AT_FUNC_NAME unlinkat
+#define AT_FUNC_F1 rmdir
+#define AT_FUNC_F2 unlink
+#define AT_FUNC_USE_F1_COND flag == AT_REMOVEDIR
+#define AT_FUNC_POST_FILE_PARAM_DECLS , int flag
+#define AT_FUNC_POST_FILE_ARGS        /* empty */
+#include "at-func.c"
+#undef AT_FUNC_NAME
+#undef AT_FUNC_F1
+#undef AT_FUNC_F2
+#undef AT_FUNC_USE_F1_COND
+#undef AT_FUNC_POST_FILE_PARAM_DECLS
+#undef AT_FUNC_POST_FILE_ARGS
 
-  err = fchdir (fd);
-  saved_errno = errno;
-
-  if (! err)
-    {
-      err = (flag == AT_REMOVEDIR ? rmdir (file) : unlink (file));
-      saved_errno = errno;
-
-      if (restore_cwd (&saved_cwd) != 0)
-       openat_restore_fail (errno);
-    }
-
-  free_cwd (&saved_cwd);
-  errno = saved_errno;
-  return err;
-}
+/* Replacement for Solaris' function by the same name.
+   Invoke chown or lchown on file, FILE, using OWNER and GROUP, in the
+   directory open on descriptor FD.  If FLAG is AT_SYMLINK_NOFOLLOW, then
+   use lchown, otherwise, use chown.  If possible, do it without changing
+   the working directory.  Otherwise, resort to using save_cwd/fchdir,
+   then mkdir/restore_cwd.  If either the save_cwd or the restore_cwd
+   fails, then give a diagnostic and exit nonzero.  */
+
+#define AT_FUNC_NAME fchownat
+#define AT_FUNC_F1 lchown
+#define AT_FUNC_F2 chown
+#define AT_FUNC_USE_F1_COND flag == AT_SYMLINK_NOFOLLOW
+#define AT_FUNC_POST_FILE_PARAM_DECLS , uid_t owner, gid_t group, int flag
+#define AT_FUNC_POST_FILE_ARGS        , owner, group
+#include "at-func.c"

Index: lib/openat.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/openat.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- lib/openat.h        20 Mar 2006 02:21:56 -0000      1.7
+++ lib/openat.h        21 Aug 2006 19:22:22 -0000      1.8
@@ -75,14 +75,45 @@
 int fstatat (int fd, char const *file, struct stat *st, int flag);
 # define unlinkat __OPENAT_ID (unlinkat)
 int unlinkat (int fd, char const *file, int flag);
+bool openat_needs_fchdir (void);
 
 #else
 
 # define openat_permissive(Fd, File, Flags, Mode, Cwd_errno) \
     openat (Fd, File, Flags, Mode)
+# define openat_needs_fchdir() false
 
 #endif
 
 int mkdirat (int fd, char const *file, mode_t mode);
 void openat_restore_fail (int) ATTRIBUTE_NORETURN;
 void openat_save_fail (int) ATTRIBUTE_NORETURN;
+int fchmodat (int fd, char const *file, mode_t mode, int flag);
+int fchownat (int fd, char const *file, uid_t owner, gid_t group, int flag);
+
+/* Using these function names makes application code
+   slightly more readable than it would be with
+   fchownat (..., 0) or fchownat (..., AT_SYMLINK_NOFOLLOW).  */
+static inline int
+chownat (int fd, char const *file, uid_t owner, gid_t group)
+{
+  return fchownat (fd, file, owner, group, 0);
+}
+
+static inline int
+lchownat (int fd, char const *file, uid_t owner, gid_t group)
+{
+  return fchownat (fd, file, owner, group, AT_SYMLINK_NOFOLLOW);
+}
+
+static inline int
+chmodat (int fd, char const *file, mode_t mode)
+{
+  return fchmodat (fd, file, mode, 0);
+}
+
+static inline int
+lchmodat (int fd, char const *file, mode_t mode)
+{
+  return fchmodat (fd, file, mode, AT_SYMLINK_NOFOLLOW);
+}

Index: lib/regex_internal.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/regex_internal.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- lib/regex_internal.h        16 Aug 2006 18:12:09 -0000      1.13
+++ lib/regex_internal.h        21 Aug 2006 19:22:22 -0000      1.14
@@ -43,9 +43,7 @@
 #if defined HAVE_WCTYPE_H || defined _LIBC
 # include <wctype.h>
 #endif /* HAVE_WCTYPE_H || _LIBC */
-#if defined HAVE_STDINT_H || defined _LIBC
-# include <stdint.h>
-#endif /* HAVE_STDINT_H || _LIBC */
+#include <stdint.h>
 #if defined _LIBC
 # include <bits/libc-lock.h>
 #else

Index: lib/stat_.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/stat_.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- lib/stat_.h 6 Jul 2006 02:17:59 -0000       1.3
+++ lib/stat_.h 21 Aug 2006 19:22:22 -0000      1.4
@@ -26,7 +26,7 @@
 
 /* mingw does not support symlinks, therefore it does not have lstat.  But
    without links, stat does just fine.  */
-#if ! HAVE_FUNC_LSTAT
+#if ! HAVE_LSTAT
 # define lstat stat
 #endif
 

Index: lib/stdint_.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/stdint_.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- lib/stdint_.h       16 Aug 2006 18:12:09 -0000      1.21
+++ lib/stdint_.h       21 Aug 2006 19:22:22 -0000      1.22
@@ -123,12 +123,12 @@
 
 #undef int64_t
 #undef uint64_t
-#if LONG_MAX >> 31 >> 31 == 1
-# define int64_t long int
-# define uint64_t unsigned long int
-#elif defined _MSC_VER
+#if defined _MSC_VER
 # define int64_t __int64
 # define uint64_t unsigned __int64
+#elif LONG_MAX >> 31 >> 31 == 1
+# define int64_t long int
+# define uint64_t unsigned long int
 #elif @HAVE_LONG_LONG_INT@
 # define int64_t long long int
 # define uint64_t unsigned long long int
@@ -423,12 +423,12 @@
 
 #undef INT64_C
 #undef UINT64_C
-#if LONG_MAX >> 31 >> 31 == 1
-# define INT64_C(x) x##L
-# define UINT64_C(x) x##UL
-#elif defined _MSC_VER
+#if defined _MSC_VER
 # define INT64_C(x) x##i64
 # define UINT64_C(x) x##ui64
+#elif LONG_MAX >> 31 >> 31 == 1
+# define INT64_C(x) x##L
+# define UINT64_C(x) x##UL
 #elif @HAVE_LONG_LONG_INT@
 # define INT64_C(x) x##LL
 # define UINT64_C(x) x##ULL

Index: lib/strtoimax.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strtoimax.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- lib/strtoimax.c     22 Jun 2006 17:28:56 -0000      1.4
+++ lib/strtoimax.c     21 Aug 2006 19:22:22 -0000      1.5
@@ -1,6 +1,6 @@
 /* Convert string representation of a number into an intmax_t value.
 
-   Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2006 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 # ifndef HAVE_DECL_STRTOULL
 "this configure-time declaration test was not run"
 # endif
-# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG
+# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG_INT
 unsigned long long strtoull (char const *, char **, int);
 # endif
 
@@ -43,14 +43,14 @@
 # ifndef HAVE_DECL_STRTOLL
 "this configure-time declaration test was not run"
 # endif
-# if !HAVE_DECL_STRTOLL && HAVE_UNSIGNED_LONG_LONG
+# if !HAVE_DECL_STRTOLL && HAVE_UNSIGNED_LONG_LONG_INT
 long long strtoll (char const *, char **, int);
 # endif
 #endif
 
 #ifdef UNSIGNED
-# undef HAVE_LONG_LONG
-# define HAVE_LONG_LONG HAVE_UNSIGNED_LONG_LONG
+# undef HAVE_LONG_LONG_INT
+# define HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT
 # define INT uintmax_t
 # define strtoimax strtoumax
 # define strtol strtoul
@@ -62,7 +62,7 @@
 INT
 strtoimax (char const *ptr, char **endptr, int base)
 {
-#if HAVE_LONG_LONG
+#if HAVE_LONG_LONG_INT
   verify (sizeof (INT) == sizeof (long int)
          || sizeof (INT) == sizeof (long long int));
 

Index: lib/tempname.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/tempname.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- lib/tempname.c      4 Jun 2006 09:25:48 -0000       1.9
+++ lib/tempname.c      21 Aug 2006 19:22:22 -0000      1.10
@@ -53,13 +53,7 @@
 # include <sys/time.h>
 #endif
 
-#if HAVE_STDINT_H || _LIBC
-# include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
+#include <stdint.h>
 #include <unistd.h>
 
 #include <sys/stat.h>

Index: m4/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/ChangeLog,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -b -r1.185 -r1.186
--- m4/ChangeLog        16 Aug 2006 18:12:09 -0000      1.185
+++ m4/ChangeLog        21 Aug 2006 19:22:22 -0000      1.186
@@ -1,3 +1,10 @@
+2006-08-21  Mark D. Baushke  <address@hidden>
+
+       * cycle-check.m4, gnulib-comp.m4, mkstemp.m4, openat.m4,
+       strtoimax.m4, strtoll.m4, strtoull.m4, strtoumax.m4: Update from
+       GNULIB.
+       * strerror_r.m4: Remove this file (per GNULIB update).
+
 2006-08-16  Mark D. Baushke  <address@hidden>
 
        * absolute-header.m4, base64.m4, getaddrinfo.m4, getline.m4,

Index: m4/cycle-check.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/cycle-check.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- m4/cycle-check.m4   16 Aug 2006 18:12:09 -0000      1.1
+++ m4/cycle-check.m4   21 Aug 2006 19:22:22 -0000      1.2
@@ -1,4 +1,4 @@
-#serial 3
+#serial 4
 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,11 +6,5 @@
 
 AC_DEFUN([gl_CYCLE_CHECK],
 [
-  AC_LIBSOURCES([cycle-check.c, cycle-check.h])
   AC_LIBOBJ([cycle-check])
-
-  dnl Prerequisites.
-  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
-  AC_REQUIRE([gl_STRUCT_DEV_INO])
-  AC_REQUIRE([gl_SAME_INODE])
 ])

Index: m4/gnulib-comp.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/gnulib-comp.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- m4/gnulib-comp.m4   16 Aug 2006 18:12:09 -0000      1.22
+++ m4/gnulib-comp.m4   21 Aug 2006 19:22:22 -0000      1.23
@@ -43,6 +43,8 @@
   gl_CLOSE_STREAM
   gl_CLOSEOUT
   gl_CYCLE_CHECK
+  gl_CHECK_TYPE_STRUCT_DIRENT_D_INO
+  gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE
   gl_STRUCT_DEV_INO
   gl_DIRNAME
   gl_FUNC_DUP2
@@ -154,6 +156,7 @@
   lib/allocsa.valgrind
   lib/asnprintf.c
   lib/asprintf.c
+  lib/at-func.c
   lib/atexit.c
   lib/base64.c
   lib/base64.h
@@ -181,6 +184,7 @@
   lib/exit.h
   lib/exitfail.c
   lib/exitfail.h
+  lib/fchmodat.c
   lib/fcntl--.h
   lib/fcntl-safer.h
   lib/fd-safer.c
@@ -448,7 +452,6 @@
   m4/strcase.m4
   m4/strdup.m4
   m4/strerror.m4
-  m4/strerror_r.m4
   m4/strftime.m4
   m4/strndup.m4
   m4/strnlen.m4

Index: m4/mkstemp.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/mkstemp.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- m4/mkstemp.m4       7 Jul 2006 02:45:34 -0000       1.7
+++ m4/mkstemp.m4       21 Aug 2006 19:22:22 -0000      1.8
@@ -67,5 +67,4 @@
 [
   AC_CHECK_HEADERS_ONCE(sys/time.h)
   AC_CHECK_FUNCS(__secure_getenv gettimeofday)
-  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
 ])

Index: m4/openat.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/openat.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- m4/openat.m4        25 Jan 2006 12:53:43 -0000      1.3
+++ m4/openat.m4        21 Aug 2006 19:22:22 -0000      1.4
@@ -1,5 +1,5 @@
-#serial 8
-# See if we need to use our replacement for Solaris' openat function.
+#serial 9
+# See if we need to use our replacement for Solaris' openat et al functions.
 
 dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -10,15 +10,18 @@
 
 AC_DEFUN([gl_FUNC_OPENAT],
 [
-  AC_LIBSOURCES([openat.c, openat.h, openat-priv.h, openat-die.c])
-  AC_LIBSOURCES([mkdirat.c])
+  AC_LIBSOURCES([openat.c, openat.h, openat-priv.h, openat-die.c, at-func.c])
   AC_LIBSOURCES([intprops.h])
+  AC_LIBSOURCES([mkdirat.c])
+  AC_LIBSOURCES([fchmodat.c])
 
-  # No system provides a mkdirat function; compile it unconditionally.
+  # No system provides these functions; compile them unconditionally.
   AC_LIBOBJ([mkdirat])
+  AC_LIBOBJ([fchmodat])
 
   AC_LIBOBJ([openat-die])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_CHECK_FUNCS_ONCE([lchmod])
   AC_CHECK_FUNCS_ONCE([fdopendir])
   AC_REPLACE_FUNCS(openat)
   case $ac_cv_func_openat in

Index: m4/strtoimax.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/strtoimax.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- m4/strtoimax.m4     7 Apr 2006 17:18:09 -0000       1.1
+++ m4/strtoimax.m4     21 Aug 2006 19:22:22 -0000      1.2
@@ -1,5 +1,5 @@
-# strtoimax.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# strtoimax.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -29,7 +29,6 @@
 
 # Prerequisites of lib/strtoimax.c.
 AC_DEFUN([gl_PREREQ_STRTOIMAX], [
-  gl_AC_TYPE_INTMAX_T
   AC_CHECK_DECLS(strtoll)
-  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
 ])

Index: m4/strtoll.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/strtoll.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- m4/strtoll.m4       7 Apr 2006 17:18:09 -0000       1.1
+++ m4/strtoll.m4       21 Aug 2006 19:22:22 -0000      1.2
@@ -1,5 +1,5 @@
-# strtoll.m4 serial 3
-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# strtoll.m4 serial 4
+dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,9 +7,9 @@
 AC_DEFUN([gl_FUNC_STRTOLL],
 [
   dnl We don't need (and can't compile) the replacement strtoll
-  dnl unless the type 'long long' exists.
-  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
-  if test "$ac_cv_type_long_long" = yes; then
+  dnl unless the type 'long long int' exists.
+  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
+  if test "$ac_cv_type_long_long_int" = yes; then
     AC_REPLACE_FUNCS(strtoll)
     if test $ac_cv_func_strtoll = no; then
       gl_PREREQ_STRTOLL

Index: m4/strtoull.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/strtoull.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- m4/strtoull.m4      7 Apr 2006 17:18:09 -0000       1.1
+++ m4/strtoull.m4      21 Aug 2006 19:22:22 -0000      1.2
@@ -1,5 +1,5 @@
-# strtoull.m4 serial 3
-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# strtoull.m4 serial 4
+dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,9 +7,9 @@
 AC_DEFUN([gl_FUNC_STRTOULL],
 [
   dnl We don't need (and can't compile) the replacement strtoull
-  dnl unless the type 'unsigned long long' exists.
-  AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
-  if test "$ac_cv_type_unsigned_long_long" = yes; then
+  dnl unless the type 'unsigned long long int' exists.
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+  if test "$ac_cv_type_unsigned_long_long_int" = yes; then
     AC_REPLACE_FUNCS(strtoull)
     if test $ac_cv_func_strtoull = no; then
       gl_PREREQ_STRTOULL

Index: m4/strtoumax.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/strtoumax.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- m4/strtoumax.m4     7 Apr 2006 17:18:09 -0000       1.1
+++ m4/strtoumax.m4     21 Aug 2006 19:22:22 -0000      1.2
@@ -1,5 +1,5 @@
-# strtoumax.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# strtoumax.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -29,7 +29,6 @@
 
 # Prerequisites of lib/strtoumax.c.
 AC_DEFUN([gl_PREREQ_STRTOUMAX], [
-  gl_AC_TYPE_UINTMAX_T
   AC_CHECK_DECLS(strtoull)
-  AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
 ])

Index: maint-aux/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/maint-aux/Makefile.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- maint-aux/Makefile.in       16 Aug 2006 18:12:09 -0000      1.39
+++ maint-aux/Makefile.in       21 Aug 2006 19:22:22 -0000      1.40
@@ -123,15 +123,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: maint-aux/gnulib-filelist.txt
===================================================================
RCS file: /cvsroot/cvs/ccvs/maint-aux/gnulib-filelist.txt,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- maint-aux/gnulib-filelist.txt       16 Aug 2006 18:12:09 -0000      1.27
+++ maint-aux/gnulib-filelist.txt       21 Aug 2006 19:22:22 -0000      1.28
@@ -1,7 +1,5 @@
 build-aux/config.rpath
 doc/getdate.texi
-lib/__fpending.c
-lib/__fpending.h
 lib/alloca.c
 lib/alloca_.h
 lib/allocsa.c
@@ -10,6 +8,7 @@
 lib/asnprintf.c
 lib/asprintf.c
 lib/atexit.c
+lib/at-func.c
 lib/base64.c
 lib/base64.h
 lib/basename.c
@@ -19,23 +18,24 @@
 lib/canonicalize.h
 lib/chdir-long.c
 lib/chdir-long.h
-lib/close-stream.c
-lib/close-stream.h
 lib/closeout.c
 lib/closeout.h
+lib/close-stream.c
+lib/close-stream.h
 lib/creat-safer.c
 lib/cycle-check.c
 lib/cycle-check.h
 lib/dev-ino.h
 lib/dirname.c
 lib/dirname.h
-lib/dup-safer.c
 lib/dup2.c
+lib/dup-safer.c
 lib/error.c
 lib/error.h
-lib/exit.h
 lib/exitfail.c
 lib/exitfail.h
+lib/exit.h
+lib/fchmodat.c
 lib/fcntl--.h
 lib/fcntl-safer.h
 lib/fd-safer.c
@@ -44,6 +44,8 @@
 lib/fnmatch.c
 lib/fnmatch_.h
 lib/fnmatch_loop.c
+lib/__fpending.c
+lib/__fpending.h
 lib/ftruncate.c
 lib/gai_strerror.c
 lib/getaddrinfo.c
@@ -63,8 +65,8 @@
 lib/getndelim2.h
 lib/getnline.c
 lib/getnline.h
-lib/getopt.c
 lib/getopt1.c
+lib/getopt.c
 lib/getopt_.h
 lib/getopt_int.h
 lib/getpagesize.h
@@ -73,9 +75,9 @@
 lib/gettext.h
 lib/gettime.c
 lib/gettimeofday.c
-lib/glob-libc.h
 lib/glob.c
 lib/glob_.h
+lib/glob-libc.h
 lib/inet_ntop.c
 lib/inet_ntop.h
 lib/intprops.h
@@ -95,16 +97,16 @@
 lib/memrchr.c
 lib/memrchr.h
 lib/minmax.h
-lib/mkdir.c
 lib/mkdirat.c
+lib/mkdir.c
 lib/mkstemp.c
 lib/mktime.c
 lib/nanosleep.c
-lib/open-safer.c
-lib/openat-die.c
-lib/openat-priv.h
 lib/openat.c
+lib/openat-die.c
 lib/openat.h
+lib/openat-priv.h
+lib/open-safer.c
 lib/pagealign_alloc.c
 lib/pagealign_alloc.h
 lib/pathmax.h
@@ -119,10 +121,10 @@
 lib/realloc.c
 lib/regcomp.c
 lib/regex.c
+lib/regexec.c
 lib/regex.h
 lib/regex_internal.c
 lib/regex_internal.h
-lib/regexec.c
 lib/rename.c
 lib/rpmatch.c
 lib/same-inode.h
@@ -134,12 +136,12 @@
 lib/snprintf.c
 lib/snprintf.h
 lib/socket_.h
-lib/stat-macros.h
 lib/stat_.h
+lib/stat-macros.h
 lib/stdbool_.h
 lib/stdint_.h
-lib/strcase.h
 lib/strcasecmp.c
+lib/strcase.h
 lib/strdup.c
 lib/strdup.h
 lib/strerror.c
@@ -149,10 +151,10 @@
 lib/strncasecmp.c
 lib/strndup.c
 lib/strndup.h
-lib/strnlen.c
-lib/strnlen.h
 lib/strnlen1.c
 lib/strnlen1.h
+lib/strnlen.c
+lib/strnlen.h
 lib/strstr.c
 lib/strstr.h
 lib/strtoimax.c
@@ -189,7 +191,6 @@
 lib/xstrndup.h
 lib/yesno.c
 lib/yesno.h
-m4/_inttypes_h.m4
 m4/absolute-header.m4
 m4/alloca.m4
 m4/allocsa.m4
@@ -201,16 +202,16 @@
 m4/canonicalize.m4
 m4/chdir-long.m4
 m4/clock_time.m4
-m4/close-stream.m4
 m4/closeout.m4
+m4/close-stream.m4
 m4/codeset.m4
 m4/cycle-check.m4
-m4/d-ino.m4
-m4/d-type.m4
 m4/dev-ino.m4
+m4/d-ino.m4
 m4/dirname.m4
 m4/dos.m4
 m4/double-slash-root.m4
+m4/d-type.m4
 m4/dup2.m4
 m4/eealloc.m4
 m4/eoverflow.m4
@@ -224,8 +225,8 @@
 m4/ftruncate.m4
 m4/getaddrinfo.m4
 m4/getcwd-abort-bug.m4
-m4/getcwd-path-max.m4
 m4/getcwd.m4
+m4/getcwd-path-max.m4
 m4/getdate.m4
 m4/getdelim.m4
 m4/gethostname.m4
@@ -239,8 +240,8 @@
 m4/gettext.m4
 m4/gettime.m4
 m4/gettimeofday.m4
-m4/glibc2.m4
 m4/glibc21.m4
+m4/glibc2.m4
 m4/glob.m4
 m4/iconv.m4
 m4/include_next.m4
@@ -248,9 +249,10 @@
 m4/intdiv0.m4
 m4/intmax.m4
 m4/intmax_t.m4
+m4/_inttypes_h.m4
+m4/inttypes_h.m4
 m4/inttypes-h.m4
 m4/inttypes-pri.m4
-m4/inttypes_h.m4
 m4/lcmessage.m4
 m4/lib-ld.m4
 m4/lib-link.m4
@@ -298,21 +300,20 @@
 m4/ssize_t.m4
 m4/stat-macros.m4
 m4/stdbool.m4
-m4/stdint.m4
 m4/stdint_h.m4
+m4/stdint.m4
 m4/strcase.m4
 m4/strdup.m4
 m4/strerror.m4
-m4/strerror_r.m4
 m4/strftime.m4
 m4/strndup.m4
 m4/strnlen.m4
 m4/strstr.m4
 m4/strtoimax.m4
-m4/strtol.m4
 m4/strtoll.m4
-m4/strtoul.m4
+m4/strtol.m4
 m4/strtoull.m4
+m4/strtoul.m4
 m4/strtoumax.m4
 m4/sys_socket_h.m4
 m4/sys_stat_h.m4
@@ -322,8 +323,8 @@
 m4/tzset.m4
 m4/uintmax_t.m4
 m4/ulonglong.m4
-m4/unistd-safer.m4
 m4/unistd_h.m4
+m4/unistd-safer.m4
 m4/unlocked-io.m4
 m4/vasnprintf.m4
 m4/vasprintf.m4

Index: man/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/man/Makefile.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- man/Makefile.in     16 Aug 2006 18:12:09 -0000      1.108
+++ man/Makefile.in     21 Aug 2006 19:22:22 -0000      1.109
@@ -125,15 +125,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/Makefile.in,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- src/Makefile.in     16 Aug 2006 18:12:09 -0000      1.180
+++ src/Makefile.in     21 Aug 2006 19:22:22 -0000      1.181
@@ -129,15 +129,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: tools/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/tools/Makefile.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- tools/Makefile.in   16 Aug 2006 18:12:09 -0000      1.98
+++ tools/Makefile.in   21 Aug 2006 19:22:22 -0000      1.99
@@ -126,15 +126,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: vms/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/Makefile.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- vms/Makefile.in     16 Aug 2006 18:12:09 -0000      1.102
+++ vms/Makefile.in     21 Aug 2006 19:22:22 -0000      1.103
@@ -129,15 +129,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: windows-NT/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/ChangeLog,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -b -r1.386 -r1.387
--- windows-NT/ChangeLog        16 Aug 2006 18:12:09 -0000      1.386
+++ windows-NT/ChangeLog        21 Aug 2006 19:22:22 -0000      1.387
@@ -1,5 +1,6 @@
 2006-08-16  Mark D. Baushke  <address@hidden>
 
+       * config.h.in.in: Updated based on ../config.h.in changes.
        * Makefile.in, config.h, config.h.in, stamp-chi, stdint.h:
        Regenerated.
 

Index: windows-NT/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/Makefile.in,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- windows-NT/Makefile.in      16 Aug 2006 18:12:09 -0000      1.132
+++ windows-NT/Makefile.in      21 Aug 2006 19:22:22 -0000      1.133
@@ -130,15 +130,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: windows-NT/config.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- windows-NT/config.h 16 Aug 2006 18:12:09 -0000      1.207
+++ windows-NT/config.h 21 Aug 2006 19:22:22 -0000      1.208
@@ -544,6 +544,9 @@
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
+/* Define to 1 if you have the `lchmod' function. */
+#undef HAVE_LCHMOD
+
 /* Define to 1 if you have the `krb' library (-lkrb). */
 #undef HAVE_LIBKRB
 
@@ -911,9 +914,6 @@
 /* Define to 1 if you have the `tzset' function. */
 #define HAVE_TZSET 1
 
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
 /* Define to 1 if you have the `uname' function. */
 #undef HAVE_UNAME
 
@@ -923,9 +923,6 @@
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
-
 /* Define to 1 if the system has the type `unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
@@ -1297,11 +1294,11 @@
 #undef USE_UNLOCKED_IO
 
 /* Define if the Win32 multithreading API can be used. */
-#undef USE_WIN32_THREADS
+#define USE_WIN32_THREADS 1
 
 /* Define if utime requires write access to the file (true on Windows, but not
    Unix). */
-#define UTIME_EXPECTS_WRITABLE 
+#define UTIME_EXPECTS_WRITABLE 1
 
 /* Define if unsetenv() returns void, not int. */
 #undef VOID_UNSETENV
@@ -1418,7 +1415,7 @@
 #define inline __inline
 #endif
 
-/* Define to long or long long if <stdint.h> and <inttypes.h> don't define. */
+/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
 #undef intmax_t
 
 /* Define to rpl_localtime if the replacement function should be used. */
@@ -1536,10 +1533,6 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t
 
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-#undef uintmax_t
-
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork
 
/*============================================================================*/

Index: windows-NT/config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- windows-NT/config.h.in      16 Aug 2006 18:12:10 -0000      1.135
+++ windows-NT/config.h.in      21 Aug 2006 19:22:22 -0000      1.136
@@ -537,6 +537,9 @@
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
+/* Define to 1 if you have the `lchmod' function. */
+#undef HAVE_LCHMOD
+
 /* Define to 1 if you have the `krb' library (-lkrb). */
 #undef HAVE_LIBKRB
 
@@ -904,9 +907,6 @@
 /* Define to 1 if you have the `tzset' function. */
 #define HAVE_TZSET 1
 
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
 /* Define to 1 if you have the `uname' function. */
 #undef HAVE_UNAME
 
@@ -916,9 +916,6 @@
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
-
 /* Define to 1 if the system has the type `unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
@@ -1290,11 +1287,11 @@
 #undef USE_UNLOCKED_IO
 
 /* Define if the Win32 multithreading API can be used. */
-#undef USE_WIN32_THREADS
+#define USE_WIN32_THREADS 1
 
 /* Define if utime requires write access to the file (true on Windows, but not
    Unix). */
-#define UTIME_EXPECTS_WRITABLE 
+#define UTIME_EXPECTS_WRITABLE 1
 
 /* Define if unsetenv() returns void, not int. */
 #undef VOID_UNSETENV
@@ -1411,7 +1408,7 @@
 #define inline __inline
 #endif
 
-/* Define to long or long long if <stdint.h> and <inttypes.h> don't define. */
+/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
 #undef intmax_t
 
 /* Define to rpl_localtime if the replacement function should be used. */
@@ -1529,10 +1526,6 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t
 
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-#undef uintmax_t
-
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork
 
/*============================================================================*/

Index: windows-NT/config.h.in.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- windows-NT/config.h.in.in   12 Aug 2006 17:16:01 -0000      1.57
+++ windows-NT/config.h.in.in   21 Aug 2006 19:22:22 -0000      1.58
@@ -513,6 +513,9 @@
 /* Define to 1 if <sys/socket.h> defines AF_INET6. */
 #undef HAVE_IPV6
 
+/* Define to 1 if you have the `iswcntrl' function. */
+#undef HAVE_ISWCNTRL
+
 /* Define to 1 if you have the `isblank' function. */
 #undef HAVE_ISBLANK
 
@@ -531,6 +534,9 @@
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
+/* Define to 1 if you have the `lchmod' function. */
+#undef HAVE_LCHMOD
+
 /* Define to 1 if you have the `krb' library (-lkrb). */
 #undef HAVE_LIBKRB
 
@@ -658,6 +664,9 @@
    */
 #undef HAVE_PARTLY_WORKING_GETCWD
 
+/* Define to 1 if you have the `pipe' function. */
+#undef HAVE_PIPE
+
 /* Define to 1 if you have the `posix_memalign' function. */
 #undef HAVE_POSIX_MEMALIGN
 
@@ -665,6 +674,12 @@
    pointers. */
 #define HAVE_PRINTF_PTR 1
 
+/* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
+#undef HAVE_PTHREAD_MUTEX_RECURSIVE
+
+/* Define if the POSIX multithreading library has read/write locks. */
+#undef HAVE_PTHREAD_RWLOCK
+
 /* Define to 1 if the system has the type `ptrdiff_t'. */
 #define HAVE_PTRDIFF_T 1
 
@@ -735,9 +750,6 @@
 /* Define to 1 if you have the `sigvec' function. */
 #undef HAVE_SIGVEC
 
-/* Define to 1 if the system has the type `sig_atomic_t'. */
-#undef HAVE_SIG_ATOMIC_T
-
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 
@@ -857,7 +869,7 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* Define to 1 if you have the <sys/wait.h> header file. */
 #undef HAVE_SYS_WAIT_H
 
 /* Define to 1 if you have the `tcgetattr' function. */
@@ -893,22 +905,6 @@
 /* Define to 1 if you have the `tzset' function. */
 #define HAVE_TZSET 1
 
-/* Define to 1 if the type 'uint64_t' is already definedin <stdint.h>. */
-#undef HAVE_UINT64_T_IN_STDINT_H
-
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
-/* Define to 1 if the type 'uintptr_t' is already defined. */
-#undef HAVE_UINTPTR_T
-
-/* Define to 1 if the type 'uint_fast64_t' is already definedin <stdint.h>. */
-#undef HAVE_UINT_FAST64_T_IN_STDINT_H
-
-/* Define to 1 if the type 'uint_least64_t' is already definedin <stdint.h>.
-   */
-#undef HAVE_UINT_LEAST64_T_IN_STDINT_H
-
 /* Define to 1 if you have the `uname' function. */
 #undef HAVE_UNAME
 
@@ -918,9 +914,6 @@
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
-
 /* Define to 1 if the system has the type `unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
@@ -1008,90 +1001,6 @@
 /* Define to 1 if you have the `__secure_getenv' function. */
 #undef HAVE___SECURE_GETENV
 
-/* Define if <stdint.h> doesn't define it. */
-#undef INT16_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT16_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT32_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT32_MIN
-
-/* Define if <stdint.h> doesn't define it but has the int64_t type. */
-#undef INT64_MAX
-
-/* Define if <stdint.h> doesn't define it but has the int64_t type. */
-#undef INT64_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT8_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT8_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INTMAX_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INTMAX_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INTPTR_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INTPTR_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_FAST16_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_FAST16_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_FAST32_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_FAST32_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_FAST64_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_FAST64_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_FAST8_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_FAST8_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_LEAST16_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_LEAST16_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_LEAST32_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_LEAST32_MIN
-
-/* Define if <stdint.h> doesn't define it but has the int_least64_t type. */
-#undef INT_LEAST64_MAX
-
-/* Define if <stdint.h> doesn't define it but has the int_least64_t type. */
-#undef INT_LEAST64_MIN
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_LEAST8_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef INT_LEAST8_MIN
-
 /* Define to include locking code which prevents versions of CVS earlier than
    1.12.4 directly accessing the same repositiory as this executable from
    ignoring this executable's promotable read locks. If only CVS versions
@@ -1163,6 +1072,9 @@
 /* Path to the pr utility */
 #undef PR_PROGRAM
 
+/* Define if the pthread_in_use() detection is hard. */
+#undef PTHREAD_IN_USE_DETECTION_HARD
+
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'ptrdiff_t'. */
 #undef PTRDIFF_T_SUFFIX
@@ -1170,8 +1082,8 @@
 /* Define to force lib/regex.c to use malloc instead of alloca. */
 #define REGEX_MALLOC 1
 
-/* Define if rename does not work for source paths with a trailing slash, like
-   the one from SunOS 4.1.1_U1. */
+/* Define if rename does not work for source file names with a trailing slash,
+   like the one from SunOS 4.1.1_U1. */
 #undef RENAME_TRAILING_SLASH_BUG
 
 /* Define as the return type of signal handlers (`int' or `void'). */
@@ -1254,7 +1166,7 @@
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
+   automatically deduced at runtime.
        STACK_DIRECTION > 0 => grows toward higher addresses
        STACK_DIRECTION < 0 => grows toward lower addresses
        STACK_DIRECTION = 0 => direction of growth unknown */
@@ -1291,48 +1203,6 @@
 /* Define if tzset clobbers localtime's static buffer. */
 #undef TZSET_CLOBBERS_LOCALTIME_BUFFER
 
-/* Define if <stdint.h> doesn't define it. */
-#undef UINT16_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINT32_MAX
-
-/* Define if <stdint.h> doesn't define it but has the uint64_t type. */
-#undef UINT64_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINT8_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINTMAX_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINTPTR_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINT_FAST16_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINT_FAST32_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINT_FAST64_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINT_FAST8_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINT_LEAST16_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINT_LEAST32_MAX
-
-/* Define if <stdint.h> doesn't define it but has the uint_least64_t type. */
-#undef UINT_LEAST64_MAX
-
-/* Define if <stdint.h> doesn't define it. */
-#undef UINT_LEAST8_MAX
-
 /* The default umask to use when creating or otherwise setting file or
    directory permissions in the repository. Must be a value in the range of 0
    through 0777. For example, a value of 002 allows group rwx access and world
@@ -1379,17 +1249,41 @@
 /* Define if wint_t is the first integer type detected with its size. */
 #undef UNIQUE_INT_TYPE_WINT_T
 
+/* Define if the POSIX multithreading library can be used. */
+#undef USE_POSIX_THREADS
+
+/* Define if references to the POSIX multithreading library should be made
+   weak. */
+#undef USE_POSIX_THREADS_WEAK
+
+/* Define if the GNU Pth multithreading library can be used. */
+#undef USE_PTH_THREADS
+
+/* Define if references to the GNU Pth multithreading library should be made
+   weak. */
+#undef USE_PTH_THREADS_WEAK
+
 /* Define if setmode is required when writing binary data to stdout. */
 #define USE_SETMODE_STDOUT 1
 
+/* Define if the old Solaris multithreading library can be used. */
+#undef USE_SOLARIS_THREADS
+
+/* Define if references to the old Solaris multithreading library should be
+   made weak. */
+#undef USE_SOLARIS_THREADS_WEAK
+
 /* Define to 1 if you want getc etc. to use unlocked I/O if available.
    Unlocked I/O can improve performance in unithreaded apps, but it is not
    safe for multithreaded apps. */
 #undef USE_UNLOCKED_IO
 
+/* Define if the Win32 multithreading API can be used. */
+#define USE_WIN32_THREADS 1
+
 /* Define if utime requires write access to the file (true on Windows, but not
    Unix). */
-#define UTIME_EXPECTS_WRITABLE
+#define UTIME_EXPECTS_WRITABLE 1
 
 /* Define if unsetenv() returns void, not int. */
 #undef VOID_UNSETENV
@@ -1490,7 +1384,7 @@
 #define inline __inline
 #endif
 
-/* Define to long or long long if <stdint.h> and <inttypes.h> don't define. */
+/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
 #undef intmax_t
 
 /* Define to rpl_localtime if the replacement function should be used. */
@@ -1608,13 +1502,5 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t
 
-/* Define to the type of a unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint32_t
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-#undef uintmax_t
-
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork

Index: windows-NT/stamp-chi
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/stamp-chi,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- windows-NT/stamp-chi        16 Aug 2006 18:12:10 -0000      1.118
+++ windows-NT/stamp-chi        21 Aug 2006 19:22:22 -0000      1.119
@@ -537,6 +537,9 @@
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
 #undef HAVE_LANGINFO_CODESET
 
+/* Define to 1 if you have the `lchmod' function. */
+#undef HAVE_LCHMOD
+
 /* Define to 1 if you have the `krb' library (-lkrb). */
 #undef HAVE_LIBKRB
 
@@ -904,9 +907,6 @@
 /* Define to 1 if you have the `tzset' function. */
 #define HAVE_TZSET 1
 
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#undef HAVE_UINTMAX_T
-
 /* Define to 1 if you have the `uname' function. */
 #undef HAVE_UNAME
 
@@ -916,9 +916,6 @@
 /* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define if you have the 'unsigned long long' type. */
-#undef HAVE_UNSIGNED_LONG_LONG
-
 /* Define to 1 if the system has the type `unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
@@ -1290,11 +1287,11 @@
 #undef USE_UNLOCKED_IO
 
 /* Define if the Win32 multithreading API can be used. */
-#undef USE_WIN32_THREADS
+#define USE_WIN32_THREADS 1
 
 /* Define if utime requires write access to the file (true on Windows, but not
    Unix). */
-#define UTIME_EXPECTS_WRITABLE 
+#define UTIME_EXPECTS_WRITABLE 1
 
 /* Define if unsetenv() returns void, not int. */
 #undef VOID_UNSETENV
@@ -1411,7 +1408,7 @@
 #define inline __inline
 #endif
 
-/* Define to long or long long if <stdint.h> and <inttypes.h> don't define. */
+/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
 #undef intmax_t
 
 /* Define to rpl_localtime if the replacement function should be used. */
@@ -1529,10 +1526,6 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t
 
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-#undef uintmax_t
-
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork
 
/*============================================================================*/

Index: windows-NT/stdint.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/stdint.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- windows-NT/stdint.h 16 Aug 2006 18:12:10 -0000      1.22
+++ windows-NT/stdint.h 21 Aug 2006 19:22:22 -0000      1.23
@@ -130,12 +130,12 @@
 
 #undef int64_t
 #undef uint64_t
-#if LONG_MAX >> 31 >> 31 == 1
-# define int64_t long int
-# define uint64_t unsigned long int
-#elif defined _MSC_VER
+#if defined _MSC_VER
 # define int64_t __int64
 # define uint64_t unsigned __int64
+#elif LONG_MAX >> 31 >> 31 == 1
+# define int64_t long int
+# define uint64_t unsigned long int
 #elif 0
 # define int64_t long long int
 # define uint64_t unsigned long long int
@@ -430,12 +430,12 @@
 
 #undef INT64_C
 #undef UINT64_C
-#if LONG_MAX >> 31 >> 31 == 1
-# define INT64_C(x) x##L
-# define UINT64_C(x) x##UL
-#elif defined _MSC_VER
+#if defined _MSC_VER
 # define INT64_C(x) x##i64
 # define UINT64_C(x) x##ui64
+#elif LONG_MAX >> 31 >> 31 == 1
+# define INT64_C(x) x##L
+# define UINT64_C(x) x##UL
 #elif 0
 # define INT64_C(x) x##LL
 # define UINT64_C(x) x##ULL

Index: windows-NT/SCC/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/SCC/Makefile.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- windows-NT/SCC/Makefile.in  16 Aug 2006 18:12:10 -0000      1.92
+++ windows-NT/SCC/Makefile.in  21 Aug 2006 19:22:22 -0000      1.93
@@ -127,15 +127,15 @@
        $(top_srcdir)/m4/sys_socket_h.m4 \
        $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/time_r.m4 \
        $(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/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/wcwidth.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/xstrndup.m4 \
-       $(top_srcdir)/m4/yesno.m4 $(top_srcdir)/configure.in
+       $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/ulonglong.m4 \
+       $(top_srcdir)/m4/unistd-safer.m4 $(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/wcwidth.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/xstrndup.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

Index: lib/at-func.c
===================================================================
RCS file: lib/at-func.c
diff -N lib/at-func.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lib/at-func.c       21 Aug 2006 19:22:22 -0000      1.1
@@ -0,0 +1,75 @@
+/* Define an at-style functions like fstatat, unlinkat, fchownat, etc.
+   Copyright (C) 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* written by Jim Meyering */
+
+#define CALL_FUNC(F)                           \
+  (AT_FUNC_USE_F1_COND                         \
+    ? AT_FUNC_F1 (F AT_FUNC_POST_FILE_ARGS)    \
+    : AT_FUNC_F2 (F AT_FUNC_POST_FILE_ARGS))
+
+/* Call AT_FUNC_F1 or AT_FUNC_F2 (testing AT_FUNC_USE_F1_COND to
+   determine which) to operate on FILE, which is in the directory
+   open on descriptor FD.  If possible, do it without changing the
+   working directory.  Otherwise, resort to using save_cwd/fchdir,
+   then AT_FUNC_F?/restore_cwd.  If either the save_cwd or the restore_cwd
+   fails, then give a diagnostic and exit nonzero.  */
+int
+AT_FUNC_NAME (int fd, char const *file AT_FUNC_POST_FILE_PARAM_DECLS)
+{
+  struct saved_cwd saved_cwd;
+  int saved_errno;
+  int err;
+
+  if (fd == AT_FDCWD || IS_ABSOLUTE_FILE_NAME (file))
+    return CALL_FUNC (file);
+
+  {
+    char *proc_file;
+    BUILD_PROC_NAME (proc_file, fd, file);
+    err = CALL_FUNC (proc_file);
+    /* If the syscall succeeds, or if it fails with an unexpected
+       errno value, then return right away.  Otherwise, fall through
+       and resort to using save_cwd/restore_cwd.  */
+    if (0 <= err || ! EXPECTED_ERRNO (errno))
+      return err;
+  }
+
+  if (save_cwd (&saved_cwd) != 0)
+    openat_save_fail (errno);
+
+  if (fchdir (fd) != 0)
+    {
+      saved_errno = errno;
+      free_cwd (&saved_cwd);
+      errno = saved_errno;
+      return -1;
+    }
+
+  err = CALL_FUNC (file);
+  saved_errno = (err < 0 ? errno : 0);
+
+  if (restore_cwd (&saved_cwd) != 0)
+    openat_restore_fail (errno);
+
+  free_cwd (&saved_cwd);
+
+  if (saved_errno)
+    errno = saved_errno;
+  return err;
+}
+#undef CALL_FUNC

Index: lib/fchmodat.c
===================================================================
RCS file: lib/fchmodat.c
diff -N lib/fchmodat.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lib/fchmodat.c      21 Aug 2006 19:22:22 -0000      1.1
@@ -0,0 +1,52 @@
+/* Change the protections of file relative to an open directory.
+   Copyright (C) 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* written by Jim Meyering */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "openat.h"
+#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
+#include "save-cwd.h"
+#include "openat-priv.h"
+
+#ifndef HAVE_LCHMOD
+/* Use a different name, to avoid conflicting with any
+   system-supplied declaration.  */
+# undef lchmod
+# define lchmod lchmod_rpl
+static int lchmod (char const *f, mode_t m) { errno = ENOSYS; return -1; }
+#endif
+
+/* Solaris 10 has no function like this.
+   Invoke chmod or lchmod on file, FILE, using mode MODE, in the directory
+   open on descriptor FD.  If possible, do it without changing the
+   working directory.  Otherwise, resort to using save_cwd/fchdir,
+   then mkdir/restore_cwd.  If either the save_cwd or the restore_cwd
+   fails, then give a diagnostic and exit nonzero.
+   Note that an attempt to use a FLAG value of AT_SYMLINK_NOFOLLOW
+   on a system without lchmod support causes this function to fail.  */
+
+#define AT_FUNC_NAME fchmodat
+#define AT_FUNC_F1 lchmod
+#define AT_FUNC_F2 chmod
+#define AT_FUNC_USE_F1_COND flag == AT_SYMLINK_NOFOLLOW
+#define AT_FUNC_POST_FILE_PARAM_DECLS , mode_t mode, int flag
+#define AT_FUNC_POST_FILE_ARGS        , mode
+#include "at-func.c"

Index: m4/strerror_r.m4
===================================================================
RCS file: m4/strerror_r.m4
diff -N m4/strerror_r.m4
--- m4/strerror_r.m4    25 Apr 2006 14:50:23 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-#serial 1004
-# This file is not needed if you can assume Autoconf 2.54 or later.
-# Experimental replacement for the function in the latest CVS autoconf.
-# Use with the error.c file in ../lib.
-
-# Copyright (C) 2001 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.
-
-undefine([AC_FUNC_STRERROR_R])
-
-# AC_FUNC_STRERROR_R
-# ------------------
-AC_DEFUN([AC_FUNC_STRERROR_R],
-[AC_CHECK_DECLS([strerror_r])
-AC_CHECK_FUNCS([strerror_r])
-AC_CACHE_CHECK([whether strerror_r returns char *],
-               ac_cv_func_strerror_r_char_p,
-   [
-    ac_cv_func_strerror_r_char_p=no
-    if test $ac_cv_have_decl_strerror_r = yes; then
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
-       [[
-         char buf[100];
-         char x = *strerror_r (0, buf, sizeof buf);
-         char *p = strerror_r (0, buf, sizeof buf);
-         return !p || x;
-       ]])],
-                       ac_cv_func_strerror_r_char_p=yes)
-    else
-      # strerror_r is not declared.  Choose between
-      # systems that have relatively inaccessible declarations for the
-      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
-      # former has a strerror_r that returns char*, while the latter
-      # has a strerror_r that returns `int'.
-      # This test should segfault on the DEC system.
-      AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
-       extern char *strerror_r ();],
-       [[char buf[100];
-         char x = *strerror_r (0, buf, sizeof buf);
-         exit (!isalpha (x));]])],
-                    ac_cv_func_strerror_r_char_p=yes, , :)
-    fi
-  ])
-if test $ac_cv_func_strerror_r_char_p = yes; then
-  AC_DEFINE([STRERROR_R_CHAR_P], 1,
-           [Define to 1 if strerror_r returns char *.])
-fi
-])# AC_FUNC_STRERROR_R




reply via email to

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