cvs-dev
[Top][All Lists]
Advanced

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

[Cvs-dev] gnulib vs another cvs update


From: Mark D. Baushke
Subject: [Cvs-dev] gnulib vs another cvs update
Date: Mon, 18 Sep 2006 11:23:29 -0700

Hi Folks,

The following patches (missing the ChangeLog entries) would be needed to
update to the latest GNULIB sources. Given that I only really wanted to
pickup the m4/inttypes.m4 (serial 5) file it may be a bit of overkill. 

I had to hack the lib/Makefile.am file so that the lib/Makefile would
built getdate.o and add it to the libcvs stuff. I am not sure why that
change happened. :-( The other changes to Makefile.am are driven by the
recent discussion that generated files might better be read-only and so
should use the -f switch to cp and rm to deal with them.

In any case, I thought if we are getting close to a release it might be
better to avoid these changes for the most part.

Is anyone working on the windows-NT target? Jim?

Is it time to just give up on windows-NT and the the CVSNT folks own
that space? Getting rid of 'emx, os2, vms, and windows-NT' support might
also be something to consider unless we actually have someone that can
build that stuff.

How close are we to a 1.12.14 release?

The only pending stuff I am aware of is:

 - 'cvs log' broken on GNU/Linux 2.2.20 alpha
 - windows-NT build break
 - [Task #4687] recent GNU diffutils
 - [Patch #4441] importinfo trigger 
 - [Patch #4442] cvs add directory trigger or deferral
 - [Patch #4443] Frank Hemer's tag extensions
 - "C. Michael Pilato" <address@hidden> patch to commit.c
 - "Prasad J Pandit" <address@hidden> cvs-chpass patch

There may also be some bugs listed that have been fixed but not updated on
the https://savannah.nongnu.org/bugs/?group=cvs page.

        -- Mark

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/Makefile.in,v
retrieving revision 1.201
diff -u -p -r1.201 Makefile.in
--- Makefile.in 2 Sep 2006 23:17:59 -0000       1.201
+++ Makefile.in 18 Sep 2006 18:00:21 -0000
@@ -245,6 +245,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: configure
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure,v
retrieving revision 1.478
diff -u -p -r1.478 configure
--- configure   2 Sep 2006 23:17:59 -0000       1.478
+++ configure   18 Sep 2006 18:00:24 -0000
@@ -780,6 +780,8 @@ ABSOLUTE_SYS_STAT_H
 SYS_STAT_H
 UNISTD_H
 EOVERFLOW
+LIBCVS_LIBDEPS
+LIBCVS_LTLIBDEPS
 USE_NLS
 MSGFMT
 GMSGFMT
@@ -6128,9 +6130,16 @@ fi
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f 
"$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; 
then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -6158,9 +6167,16 @@ fi
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; 
then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi
@@ -18786,6 +18802,8 @@ _ACEOF
 
 
 
+
+
 { echo "$as_me:$LINENO: checking for working mktime" >&5
 echo $ECHO_N "checking for working mktime... $ECHO_C" >&6; }
 if test "${ac_cv_func_working_mktime+set}" = set; then
@@ -18801,11 +18819,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 /* Test program from Paul Eggert and Tony Leneis.  */
-#if TIME_WITH_SYS_TIME
+#ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
 #else
-# if HAVE_SYS_TIME_H
+# ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
 # else
 #  include <time.h>
@@ -18813,9 +18831,12 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
 
-#if !HAVE_ALARM
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef HAVE_ALARM
 # define alarm(X) /* empty */
 #endif
 
@@ -18832,9 +18853,9 @@ static char *tz_strings[] = {
 };
 #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
 
-/* Fail if mktime fails to convert a date in the spring-forward gap.
+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
    Based on a problem report from Andreas Jaeger.  */
-static void
+static int
 spring_forward_gap ()
 {
   /* glibc (up to about 1998-10-07) failed this test. */
@@ -18853,29 +18874,27 @@ spring_forward_gap ()
   tm.tm_min = 0;
   tm.tm_sec = 0;
   tm.tm_isdst = -1;
-  if (mktime (&tm) == (time_t)-1)
-    exit (1);
+  return mktime (&tm) != (time_t) -1;
 }
 
-static void
+static int
 mktime_test1 (now)
      time_t now;
 {
   struct tm *lt;
-  if ((lt = localtime (&now)) && mktime (lt) != now)
-    exit (1);
+  return ! (lt = localtime (&now)) || mktime (lt) == now;
 }
 
-static void
+static int
 mktime_test (now)
      time_t now;
 {
-  mktime_test1 (now);
-  mktime_test1 ((time_t) (time_t_max - now));
-  mktime_test1 ((time_t) (time_t_min + now));
+  return (mktime_test1 (now)
+         && mktime_test1 ((time_t) (time_t_max - now))
+         && mktime_test1 ((time_t) (time_t_min + now)));
 }
 
-static void
+static int
 irix_6_4_bug ()
 {
   /* Based on code from Ariel Faigon.  */
@@ -18888,11 +18907,10 @@ irix_6_4_bug ()
   tm.tm_sec = 0;
   tm.tm_isdst = -1;
   mktime (&tm);
-  if (tm.tm_mon != 2 || tm.tm_mday != 31)
-    exit (1);
+  return tm.tm_mon == 2 && tm.tm_mday == 31;
 }
 
-static void
+static int
 bigtime_test (j)
      int j;
 {
@@ -18914,8 +18932,39 @@ bigtime_test (j)
             && lt->tm_wday == tm.tm_wday
             && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
                  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
-       exit (1);
+       return 0;
     }
+  return 1;
+}
+
+static int
+year_2050_test ()
+{
+  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
+     ignoring leap seconds.  */
+  unsigned long int answer = 2527315200UL;
+
+  struct tm tm;
+  time_t t;
+  tm.tm_year = 2050 - 1900;
+  tm.tm_mon = 2 - 1;
+  tm.tm_mday = 1;
+  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
+  tm.tm_isdst = -1;
+
+  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
+     instead of "TZ=America/Vancouver" in order to detect the bug even
+     on systems that don't support the Olson extension, or don't have the
+     full zoneinfo tables installed.  */
+  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+
+  t = mktime (&tm);
+
+  /* Check that the result is either a failure, or close enough
+     to the correct answer that we can assume the discrepancy is
+     due to leap seconds.  */
+  return (t == (time_t) -1
+         || (0 < t && answer - 120 <= t && t <= answer + 120));
 }
 
 int
@@ -18942,18 +18991,20 @@ main ()
        putenv (tz_strings[i]);
 
       for (t = 0; t <= time_t_max - delta; t += delta)
-       mktime_test (t);
-      mktime_test ((time_t) 1);
-      mktime_test ((time_t) (60 * 60));
-      mktime_test ((time_t) (60 * 60 * 24));
+       if (! mktime_test (t))
+         return 1;
+      if (! (mktime_test ((time_t) 1)
+            && mktime_test ((time_t) (60 * 60))
+            && mktime_test ((time_t) (60 * 60 * 24))))
+       return 1;
 
       for (j = 1; 0 < j; j *= 2)
-       bigtime_test (j);
-      bigtime_test (j - 1);
+       if (! bigtime_test (j))
+         return 1;
+      if (! bigtime_test (j - 1))
+       return 1;
     }
-  irix_6_4_bug ();
-  spring_forward_gap ();
-  exit (0);
+  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -22035,6 +22086,9 @@ else
   GL_COND_LIBTOOL_FALSE=
 fi
 
+  gl_cond_libtool=false
+  gl_libdeps=
+  gl_ltlibdeps=
 
 
 
@@ -26697,13 +26751,6 @@ _ACEOF
   esac
 
 
-  case " $LIBOBJS " in
-  *" getdate.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS getdate.$ac_objext"
- ;;
-esac
-
-
 
 
 
@@ -29321,8 +29368,8 @@ fi
 
 
               gl_cv_header_working_inttypes_h=no
-  if test $gl_cv_header_working_stdint_h = yes \
-     && test $gl_cv_header_inttypes_h = yes \
+  if test "$gl_cv_header_working_stdint_h" = yes \
+     && test "$gl_cv_header_inttypes_h" = yes \
      && test "$ac_cv_have_decl_imaxabs" = yes \
      && test "$ac_cv_have_decl_imaxdiv" = yes \
      && test "$ac_cv_have_decl_strtoimax" = yes \
@@ -32683,7 +32730,7 @@ fi
 
  { echo "$as_me:$LINENO: checking whether rename is broken" >&5
 echo $ECHO_N "checking whether rename is broken... $ECHO_C" >&6; }
-if test "${vb_cv_func_rename_trailing_slash_bug+set}" = set; then
+if test "${gl_cv_func_rename_trailing_slash_bug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32693,7 +32740,7 @@ else
 echo "$as_me: error: cannot create temporary directory" >&2;}
    { (exit 1); exit 1; }; }
     if test "$cross_compiling" = yes; then
-        vb_cv_func_rename_trailing_slash_bug=yes
+        gl_cv_func_rename_trailing_slash_bug=yes
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -32731,14 +32778,14 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  vb_cv_func_rename_trailing_slash_bug=no
+  gl_cv_func_rename_trailing_slash_bug=no
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-vb_cv_func_rename_trailing_slash_bug=yes
+gl_cv_func_rename_trailing_slash_bug=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext 
conftest.$ac_objext conftest.$ac_ext
 fi
@@ -32748,9 +32795,9 @@ fi
       rm -rf conftest.d1 conftest.d2
 
 fi
-{ echo "$as_me:$LINENO: result: $vb_cv_func_rename_trailing_slash_bug" >&5
-echo "${ECHO_T}$vb_cv_func_rename_trailing_slash_bug" >&6; }
-  if test $vb_cv_func_rename_trailing_slash_bug = yes; then
+{ echo "$as_me:$LINENO: result: $gl_cv_func_rename_trailing_slash_bug" >&5
+echo "${ECHO_T}$gl_cv_func_rename_trailing_slash_bug" >&6; }
+  if test $gl_cv_func_rename_trailing_slash_bug = yes; then
     case " $LIBOBJS " in
   *" rename.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS rename.$ac_objext"
@@ -39918,6 +39965,10 @@ esac
 
     :
 
+  LIBCVS_LIBDEPS="$gl_libdeps"
+
+  LIBCVS_LTLIBDEPS="$gl_ltlibdeps"
+
 
 
   { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
@@ -40298,9 +40349,16 @@ fi
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f 
"$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; 
then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -40328,9 +40386,16 @@ fi
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; 
then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi
@@ -41135,9 +41200,16 @@ fi
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f 
"$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; 
then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -41165,9 +41237,16 @@ fi
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; 
then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi
@@ -55251,6 +55330,8 @@ ABSOLUTE_SYS_STAT_H!$ABSOLUTE_SYS_STAT_H
 SYS_STAT_H!$SYS_STAT_H$ac_delim
 UNISTD_H!$UNISTD_H$ac_delim
 EOVERFLOW!$EOVERFLOW$ac_delim
+LIBCVS_LIBDEPS!$LIBCVS_LIBDEPS$ac_delim
+LIBCVS_LTLIBDEPS!$LIBCVS_LTLIBDEPS$ac_delim
 USE_NLS!$USE_NLS$ac_delim
 MSGFMT!$MSGFMT$ac_delim
 GMSGFMT!$GMSGFMT$ac_delim
@@ -55277,7 +55358,7 @@ EDITOR!$EDITOR$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -55296,7 +55377,7 @@ fi
 
 cat >>$CONFIG_STATUS <<_ACEOF
 cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 _ACEOF
 sed '
 s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -55309,8 +55390,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!
 ' >>$CONFIG_STATUS <conf$$subs.sed
 rm -f conf$$subs.sed
 cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
 CEOF$ac_eof
 _ACEOF
 
@@ -55558,7 +55637,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" 
>$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 
's/|#_!!_#|//g' >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
Index: contrib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/Makefile.in,v
retrieving revision 1.140
diff -u -p -r1.140 Makefile.in
--- contrib/Makefile.in 2 Sep 2006 23:17:59 -0000       1.140
+++ contrib/Makefile.in 18 Sep 2006 18:00:24 -0000
@@ -247,6 +247,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: contrib/pam/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/pam/Makefile.in,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile.in
--- contrib/pam/Makefile.in     2 Sep 2006 23:17:59 -0000       1.61
+++ contrib/pam/Makefile.in     18 Sep 2006 18:00:24 -0000
@@ -213,6 +213,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: diff/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/diff/Makefile.in,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile.in
--- diff/Makefile.in    2 Sep 2006 23:17:59 -0000       1.109
+++ diff/Makefile.in    18 Sep 2006 18:00:24 -0000
@@ -222,6 +222,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/Makefile.in,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile.in
--- doc/Makefile.in     2 Sep 2006 23:17:59 -0000       1.156
+++ doc/Makefile.in     18 Sep 2006 18:00:24 -0000
@@ -243,6 +243,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: doc/i18n/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/i18n/Makefile.in,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile.in
--- doc/i18n/Makefile.in        2 Sep 2006 23:17:59 -0000       1.44
+++ doc/i18n/Makefile.in        18 Sep 2006 18:00:24 -0000
@@ -221,6 +221,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: doc/i18n/pt_BR/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/i18n/pt_BR/Makefile.in,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile.in
--- doc/i18n/pt_BR/Makefile.in  2 Sep 2006 23:17:59 -0000       1.45
+++ doc/i18n/pt_BR/Makefile.in  18 Sep 2006 18:00:24 -0000
@@ -212,6 +212,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.am,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile.am
--- lib/Makefile.am     2 Sep 2006 23:17:59 -0000       1.122
+++ lib/Makefile.am     18 Sep 2006 18:00:24 -0000
@@ -71,8 +71,8 @@ EXTRA_DIST += alloca_.h
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
 alloca.h: alloca_.h
-       cp $(srcdir)/alloca_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/alloca_.h address@hidden
+       mv -f address@hidden $@
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
 ## end   gnulib module alloca-opt
@@ -92,6 +92,7 @@ BUILT_SOURCES += $(ARPA_INET_H)
 # doesn't have one.
 arpa/inet.h:
        test -d arpa || mkdir arpa
+       rm -f address@hidden $@
        echo '#include <sys/socket.h>' >address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
@@ -181,6 +182,7 @@ EXTRA_DIST += fcntl_.h
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
 fcntl.h: fcntl_.h
+       rm -f address@hidden $@
        sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \
            < $(srcdir)/fcntl_.h > address@hidden
        mv address@hidden $@
@@ -208,8 +210,8 @@ EXTRA_DIST += fnmatch_.h fnmatch_loop.c
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
 fnmatch.h: fnmatch_.h
-       cp $(srcdir)/fnmatch_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/fnmatch_.h address@hidden
+       mv -f address@hidden $@
 MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
 
 ## end   gnulib module fnmatch
@@ -253,6 +255,7 @@ getdate_LDADD = \
        $(LIB_CLOCK_GETTIME) \
        $(LIBINTL)
 
+libcvs_a_SOURCES += getdate.c
 BUILT_SOURCES += getdate.c
 MAINTAINERCLEANFILES += getdate.c
 EXTRA_DIST += getdate.c getdate.h
@@ -297,8 +300,8 @@ EXTRA_DIST += getopt_.h getopt_int.h
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
 getopt.h: getopt_.h
-       cp $(srcdir)/getopt_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/getopt_.h address@hidden
+       mv -f address@hidden $@
 MOSTLYCLEANFILES += getopt.h getopt.h-t
 
 ## end   gnulib module getopt
@@ -344,8 +347,8 @@ EXTRA_DIST += glob_.h glob-libc.h
 # doesn't have one that works with the given compiler.
 all-local $(libcvs_a_OBJECTS): $(GLOB_H)
 glob.h: glob_.h
-       cp $(srcdir)/glob_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/glob_.h address@hidden
+       mv -f address@hidden $@
 MOSTLYCLEANFILES += glob.h glob.h-t
 
 ## end   gnulib module glob
@@ -370,6 +373,7 @@ EXTRA_DIST += inttypes_.h
 # We need the following in order to create <inttypes.h> when the system
 # doesn't have one that works with the given compiler.
 inttypes.h: inttypes_.h
+       rm -f address@hidden $@
        sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
            -e 's|@''ABSOLUTE_INTTYPES_H''@|$(ABSOLUTE_INTTYPES_H)|g' \
            -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
@@ -441,6 +445,7 @@ BUILT_SOURCES += $(NETINET_IN_H)
 # doesn't have one.
 netinet/in.h:
        test -d netinet || mkdir netinet
+       rm -f address@hidden $@
        echo '#include <sys/socket.h>' >address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
@@ -522,6 +527,7 @@ EXTRA_DIST += stdbool_.h
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
 stdbool.h: stdbool_.h
+       rm -f address@hidden $@
        sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' \
                < $(srcdir)/stdbool_.h > address@hidden
        mv address@hidden $@
@@ -537,6 +543,7 @@ EXTRA_DIST += stdint_.h
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
 stdint.h: stdint_.h
+       rm -f address@hidden $@
        sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
            -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
            -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
@@ -615,8 +622,8 @@ EXTRA_DIST += socket_.h
 # doesn't have one that works with the given compiler.
 sys/socket.h: socket_.h
        test -d sys || mkdir sys
-       cp $(srcdir)/socket_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/socket_.h address@hidden
+       mv -f address@hidden $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
 MOSTLYCLEANDIRS += sys
 
@@ -631,6 +638,7 @@ EXTRA_DIST += stat_.h
 # has one that is incomplete.
 sys/stat.h: stat_.h
        test -d sys || mkdir sys
+       rm -f address@hidden $@
        sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \
            < $(srcdir)/stat_.h > address@hidden
        mv address@hidden $@
Index: lib/Makefile.gnulib
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.gnulib,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile.gnulib
--- lib/Makefile.gnulib 2 Sep 2006 23:17:59 -0000       1.85
+++ lib/Makefile.gnulib 18 Sep 2006 18:00:24 -0000
@@ -15,7 +15,7 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependen
 noinst_LIBRARIES = libcvs.a
 
 libcvs_a_SOURCES =
-libcvs_a_LIBADD = @LIBOBJS@
+libcvs_a_LIBADD = $(LIBOBJS)
 noinst_HEADERS =
 EXTRA_DIST =
 BUILT_SOURCES =
@@ -42,8 +42,8 @@ EXTRA_DIST += alloca_.h
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
 alloca.h: alloca_.h
-       cp $(srcdir)/alloca_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/alloca_.h address@hidden
+       mv -f address@hidden $@
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
 ## end   gnulib module alloca-opt
@@ -63,6 +63,7 @@ BUILT_SOURCES += $(ARPA_INET_H)
 # doesn't have one.
 arpa/inet.h:
        test -d arpa || mkdir arpa
+       rm -f address@hidden $@
        echo '#include <sys/socket.h>' >address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
@@ -144,6 +145,7 @@ EXTRA_DIST += fcntl_.h
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
 fcntl.h: fcntl_.h
+       rm -f address@hidden $@
        sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \
            < $(srcdir)/fcntl_.h > address@hidden
        mv address@hidden $@
@@ -171,8 +173,8 @@ EXTRA_DIST += fnmatch_.h fnmatch_loop.c
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
 fnmatch.h: fnmatch_.h
-       cp $(srcdir)/fnmatch_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/fnmatch_.h address@hidden
+       mv -f address@hidden $@
 MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
 
 ## end   gnulib module fnmatch
@@ -242,8 +244,8 @@ EXTRA_DIST += getopt_.h getopt_int.h
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
 getopt.h: getopt_.h
-       cp $(srcdir)/getopt_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/getopt_.h address@hidden
+       mv -f address@hidden $@
 MOSTLYCLEANFILES += getopt.h getopt.h-t
 
 ## end   gnulib module getopt
@@ -288,8 +290,8 @@ EXTRA_DIST += glob_.h glob-libc.h
 # We need the following in order to create <glob.h> when the system
 # doesn't have one that works with the given compiler.
 glob.h: glob_.h
-       cp $(srcdir)/glob_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/glob_.h address@hidden
+       mv -f address@hidden $@
 MOSTLYCLEANFILES += glob.h glob.h-t
 
 ## end   gnulib module glob
@@ -314,6 +316,7 @@ EXTRA_DIST += inttypes_.h
 # We need the following in order to create <inttypes.h> when the system
 # doesn't have one that works with the given compiler.
 inttypes.h: inttypes_.h
+       rm -f address@hidden $@
        sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
            -e 's|@''ABSOLUTE_INTTYPES_H''@|$(ABSOLUTE_INTTYPES_H)|g' \
            -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
@@ -385,6 +388,7 @@ BUILT_SOURCES += $(NETINET_IN_H)
 # doesn't have one.
 netinet/in.h:
        test -d netinet || mkdir netinet
+       rm -f address@hidden $@
        echo '#include <sys/socket.h>' >address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
@@ -466,6 +470,7 @@ EXTRA_DIST += stdbool_.h
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
 stdbool.h: stdbool_.h
+       rm -f address@hidden $@
        sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > 
address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
@@ -480,6 +485,7 @@ EXTRA_DIST += stdint_.h
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
 stdint.h: stdint_.h
+       rm -f address@hidden $@
        sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
            -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
            -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
@@ -558,8 +564,8 @@ EXTRA_DIST += socket_.h
 # doesn't have one that works with the given compiler.
 sys/socket.h: socket_.h
        test -d sys || mkdir sys
-       cp $(srcdir)/socket_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/socket_.h address@hidden
+       mv -f address@hidden $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
 MOSTLYCLEANDIRS += sys
 
@@ -574,6 +580,7 @@ EXTRA_DIST += stat_.h
 # has one that is incomplete.
 sys/stat.h: stat_.h
        test -d sys || mkdir sys
+       rm -f address@hidden $@
        sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \
            < $(srcdir)/stat_.h > address@hidden
        mv address@hidden $@
Index: lib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.in,v
retrieving revision 1.223
diff -u -p -r1.223 Makefile.in
--- lib/Makefile.in     2 Sep 2006 23:17:59 -0000       1.223
+++ lib/Makefile.in     18 Sep 2006 18:00:24 -0000
@@ -168,8 +168,9 @@ ARFLAGS = cru
 libcvs_a_AR = $(AR) $(ARFLAGS)
 libcvs_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
 am_libcvs_a_OBJECTS = sighandle.$(OBJEXT) allocsa.$(OBJEXT) \
-       base64.$(OBJEXT) getnline.$(OBJEXT) strnlen1.$(OBJEXT) \
-       xalloc-die.$(OBJEXT) xgethostname.$(OBJEXT) xstrndup.$(OBJEXT)
+       base64.$(OBJEXT) getdate.$(OBJEXT) getnline.$(OBJEXT) \
+       strnlen1.$(OBJEXT) xalloc-die.$(OBJEXT) xgethostname.$(OBJEXT) \
+       xstrndup.$(OBJEXT)
 libcvs_a_OBJECTS = $(am_libcvs_a_OBJECTS)
 am_getdate_OBJECTS = getdate-error.$(OBJEXT) getdate-getdate.$(OBJEXT) \
        getdate-progname.$(OBJEXT)
@@ -264,6 +265,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
@@ -385,9 +388,9 @@ noinst_LIBRARIES = libcvs.a
 # matching?)
 libcvs_a_SOURCES = sighandle.c system.h wait.h xselect.h xtime.h \
        allocsa.h allocsa.c base64.h base64.c error.h exit.h \
-       getaddrinfo.h getnline.h getnline.c gettext.h inet_ntop.h \
-       mbchar.h mbuiter.h md5.h minmax.h setenv.h size_max.h \
-       snprintf.h strcase.h strnlen1.h strnlen1.c strstr.h \
+       getaddrinfo.h getdate.c getnline.h getnline.c gettext.h \
+       inet_ntop.h mbchar.h mbuiter.h md5.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
@@ -523,7 +526,6 @@ distclean-compile:
 @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@
@@ -597,6 +599,7 @@ distclean-compile:
 @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@
@@ -933,19 +936,21 @@ uninstall-am: uninstall-info-am
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
 alloca.h: alloca_.h
-       cp $(srcdir)/alloca_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/alloca_.h address@hidden
+       mv -f address@hidden $@
 
 # We need the following in order to create <arpa/inet.h> when the system
 # doesn't have one.
 arpa/inet.h:
        test -d arpa || mkdir arpa
+       rm -f address@hidden $@
        echo '#include <sys/socket.h>' >address@hidden
        mv address@hidden $@
 
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
 fcntl.h: fcntl_.h
+       rm -f address@hidden $@
        sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \
            < $(srcdir)/fcntl_.h > address@hidden
        mv address@hidden $@
@@ -953,25 +958,26 @@ fcntl.h: fcntl_.h
 # We need the following in order to create <fnmatch.h> when the system
 # doesn't have one that supports the required API.
 fnmatch.h: fnmatch_.h
-       cp $(srcdir)/fnmatch_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/fnmatch_.h address@hidden
+       mv -f address@hidden $@
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
 getopt.h: getopt_.h
-       cp $(srcdir)/getopt_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/getopt_.h address@hidden
+       mv -f address@hidden $@
 
 # We need the following in order to create <glob.h> when the system
 # doesn't have one that works with the given compiler.
 all-local $(libcvs_a_OBJECTS): $(GLOB_H)
 glob.h: glob_.h
-       cp $(srcdir)/glob_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/glob_.h address@hidden
+       mv -f address@hidden $@
 
 # We need the following in order to create <inttypes.h> when the system
 # doesn't have one that works with the given compiler.
 inttypes.h: inttypes_.h
+       rm -f address@hidden $@
        sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
            -e 's|@''ABSOLUTE_INTTYPES_H''@|$(ABSOLUTE_INTTYPES_H)|g' \
            -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \
@@ -988,12 +994,14 @@ inttypes.h: inttypes_.h
 # doesn't have one.
 netinet/in.h:
        test -d netinet || mkdir netinet
+       rm -f address@hidden $@
        echo '#include <sys/socket.h>' >address@hidden
        mv address@hidden $@
 
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
 stdbool.h: stdbool_.h
+       rm -f address@hidden $@
        sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' \
                < $(srcdir)/stdbool_.h > address@hidden
        mv address@hidden $@
@@ -1001,6 +1009,7 @@ stdbool.h: stdbool_.h
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
 stdint.h: stdint_.h
+       rm -f address@hidden $@
        sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
            -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
            -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
@@ -1029,13 +1038,14 @@ stdint.h: stdint_.h
 # doesn't have one that works with the given compiler.
 sys/socket.h: socket_.h
        test -d sys || mkdir sys
-       cp $(srcdir)/socket_.h address@hidden
-       mv address@hidden $@
+       cp -f $(srcdir)/socket_.h address@hidden
+       mv -f address@hidden $@
 
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
 sys/stat.h: stat_.h
        test -d sys || mkdir sys
+       rm -f address@hidden $@
        sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \
            < $(srcdir)/stat_.h > address@hidden
        mv address@hidden $@
Index: lib/__fpending.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/__fpending.c,v
retrieving revision 1.3
diff -u -p -r1.3 __fpending.c
--- lib/__fpending.c    19 Sep 2005 21:26:13 -0000      1.3
+++ lib/__fpending.c    18 Sep 2006 18:00:24 -0000
@@ -1,5 +1,5 @@
 /* __fpending.c -- return the number of pending output bytes on a stream
-   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 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
@@ -17,9 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "__fpending.h"
 
Index: lib/alloca.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/alloca.c,v
retrieving revision 1.4
diff -u -p -r1.4 alloca.c
--- lib/alloca.c        5 Oct 2004 18:58:25 -0000       1.4
+++ lib/alloca.c        18 Sep 2006 18:00:24 -0000
@@ -21,9 +21,7 @@
    allocating any.  It is a good idea to use alloca(0) in
    your main control loop, etc. to force garbage collection.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <alloca.h>
 
Index: lib/allocsa.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/allocsa.c,v
retrieving revision 1.2
diff -u -p -r1.2 allocsa.c
--- lib/allocsa.c       23 May 2005 17:44:30 -0000      1.2
+++ lib/allocsa.c       18 Sep 2006 18:00:24 -0000
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2003.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "allocsa.h"
Index: lib/asnprintf.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/asnprintf.c,v
retrieving revision 1.2
diff -u -p -r1.2 asnprintf.c
--- lib/asnprintf.c     23 May 2005 17:44:30 -0000      1.2
+++ lib/asnprintf.c     18 Sep 2006 18:00:24 -0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 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
@@ -15,9 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "vasnprintf.h"
Index: lib/asprintf.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/asprintf.c,v
retrieving revision 1.2
diff -u -p -r1.2 asprintf.c
--- lib/asprintf.c      23 May 2005 17:44:30 -0000      1.2
+++ lib/asprintf.c      18 Sep 2006 18:00:24 -0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 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
@@ -15,9 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "vasprintf.h"
Index: lib/atexit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/atexit.c,v
retrieving revision 1.2
diff -u -p -r1.2 atexit.c
--- lib/atexit.c        19 Sep 2005 21:26:13 -0000      1.2
+++ lib/atexit.c        18 Sep 2006 18:00:24 -0000
@@ -1,9 +1,7 @@
 /* Wrapper to implement ANSI C's atexit using SunOS's on_exit. */
 /* This function is in the public domain.  --Mike Stump. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 int
 atexit (void (*f) (void))
Index: lib/basename.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/basename.c,v
retrieving revision 1.6
diff -u -p -r1.6 basename.c
--- lib/basename.c      6 Jul 2006 02:17:59 -0000       1.6
+++ lib/basename.c      18 Sep 2006 18:00:24 -0000
@@ -17,9 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirname.h"
 
Index: lib/canon-host.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/canon-host.c,v
retrieving revision 1.4
diff -u -p -r1.4 canon-host.c
--- lib/canon-host.c    13 Sep 2005 13:56:47 -0000      1.4
+++ lib/canon-host.c    18 Sep 2006 18:00:24 -0000
@@ -1,6 +1,6 @@
 /* Host name canonicalization
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    Written by Derek Price <address@hidden>.
 
@@ -18,9 +18,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "canon-host.h"
 
Index: lib/canonicalize.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/canonicalize.c,v
retrieving revision 1.3
diff -u -p -r1.3 canonicalize.c
--- lib/canonicalize.c  4 Oct 2005 02:34:53 -0000       1.3
+++ lib/canonicalize.c  18 Sep 2006 18:00:24 -0000
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-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
@@ -16,9 +16,7 @@
    If not, write to the Free Software Foundation,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "canonicalize.h"
 
Index: lib/chdir-long.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/chdir-long.c,v
retrieving revision 1.6
diff -u -p -r1.6 chdir-long.c
--- lib/chdir-long.c    2 Sep 2006 23:17:59 -0000       1.6
+++ lib/chdir-long.c    18 Sep 2006 18:00:24 -0000
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "chdir-long.h"
 
@@ -263,6 +261,6 @@ main (int argc, char *argv[])
 
 /*
 Local Variables:
-compile-command: "gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall 
chdir-long.c libcoreutils.a"
+compile-command: "gcc -DTEST_CHDIR=1 -g -O -W -Wall chdir-long.c 
libcoreutils.a"
 End:
 */
Index: lib/chown.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/chown.c,v
retrieving revision 1.1
diff -u -p -r1.1 chown.c
--- lib/chown.c 24 Aug 2006 01:24:14 -0000      1.1
+++ lib/chown.c 18 Sep 2006 18:00:24 -0000
@@ -1,6 +1,7 @@
 /* provide consistent interface to chown for systems that don't interpret
    an ID of -1 as meaning `don't change the corresponding ID'.
-   Copyright (C) 1997, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 1997, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Disable the definition of chown to rpl_chown (from config.h) in this
    file.  Otherwise, we'd get conflicting prototypes for rpl_chown on
Index: lib/close-stream.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/close-stream.c,v
retrieving revision 1.1
diff -u -p -r1.1 close-stream.c
--- lib/close-stream.c  16 Aug 2006 18:12:09 -0000      1.1
+++ lib/close-stream.c  18 Sep 2006 18:00:24 -0000
@@ -17,9 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "close-stream.h"
 
Index: lib/closeout.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/closeout.c,v
retrieving revision 1.5
diff -u -p -r1.5 closeout.c
--- lib/closeout.c      16 Aug 2006 18:12:09 -0000      1.5
+++ lib/closeout.c      18 Sep 2006 18:00:24 -0000
@@ -17,9 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "closeout.h"
 
Index: lib/creat-safer.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/creat-safer.c,v
retrieving revision 1.1
diff -u -p -r1.1 creat-safer.c
--- lib/creat-safer.c   4 Oct 2005 02:34:53 -0000       1.1
+++ lib/creat-safer.c   18 Sep 2006 18:00:24 -0000
@@ -1,5 +1,6 @@
 /* Invoke creat, but avoid some glitches.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "fcntl-safer.h"
 
Index: lib/cycle-check.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/cycle-check.c,v
retrieving revision 1.3
diff -u -p -r1.3 cycle-check.c
--- lib/cycle-check.c   6 Jul 2006 02:17:59 -0000       1.3
+++ lib/cycle-check.c   18 Sep 2006 18:00:24 -0000
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
Index: lib/dirname.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/dirname.c,v
retrieving revision 1.6
diff -u -p -r1.6 dirname.c
--- lib/dirname.c       6 Jul 2006 02:17:59 -0000       1.6
+++ lib/dirname.c       18 Sep 2006 18:00:24 -0000
@@ -17,9 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirname.h"
 
Index: lib/dup-safer.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/dup-safer.c,v
retrieving revision 1.5
diff -u -p -r1.5 dup-safer.c
--- lib/dup-safer.c     19 Sep 2005 21:26:13 -0000      1.5
+++ lib/dup-safer.c     18 Sep 2006 18:00:24 -0000
@@ -1,5 +1,6 @@
 /* Invoke dup, but avoid some glitches.
-   Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "unistd-safer.h"
 
Index: lib/dup2.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/dup2.c,v
retrieving revision 1.6
diff -u -p -r1.6 dup2.c
--- lib/dup2.c  4 Oct 2005 02:34:53 -0000       1.6
+++ lib/dup2.c  18 Sep 2006 18:00:24 -0000
@@ -1,5 +1,6 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
-   Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* written by Paul Eggert */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <fcntl.h>
Index: lib/error.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/error.c,v
retrieving revision 1.10
diff -u -p -r1.10 error.c
--- lib/error.c 2 Sep 2006 23:17:59 -0000       1.10
+++ lib/error.c 18 Sep 2006 18:00:24 -0000
@@ -18,7 +18,7 @@
 
 /* Written by David MacKenzie <address@hidden>.  */
 
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
 # include <config.h>
 #endif
 
Index: lib/exitfail.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/exitfail.c,v
retrieving revision 1.4
diff -u -p -r1.4 exitfail.c
--- lib/exitfail.c      16 Aug 2006 18:12:09 -0000      1.4
+++ lib/exitfail.c      18 Sep 2006 18:00:24 -0000
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
    If not, write to the Free Software Foundation,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "exitfail.h"
 #include "exit.h"
Index: lib/fchmodat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/fchmodat.c,v
retrieving revision 1.1
diff -u -p -r1.1 fchmodat.c
--- lib/fchmodat.c      21 Aug 2006 19:22:22 -0000      1.1
+++ lib/fchmodat.c      18 Sep 2006 18:00:24 -0000
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "openat.h"
 #include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
Index: lib/fchown-stub.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/fchown-stub.c,v
retrieving revision 1.1
diff -u -p -r1.1 fchown-stub.c
--- lib/fchown-stub.c   24 Aug 2006 01:24:14 -0000      1.1
+++ lib/fchown-stub.c   18 Sep 2006 18:00:24 -0000
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
 #include <sys/types.h>
 #include <errno.h>
 
Index: lib/fd-safer.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/fd-safer.c,v
retrieving revision 1.4
diff -u -p -r1.4 fd-safer.c
--- lib/fd-safer.c      19 Sep 2005 21:26:13 -0000      1.4
+++ lib/fd-safer.c      18 Sep 2006 18:00:24 -0000
@@ -1,6 +1,6 @@
 /* Return a safer copy of a file descriptor.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "unistd-safer.h"
 
Index: lib/filenamecat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/filenamecat.c,v
retrieving revision 1.3
diff -u -p -r1.3 filenamecat.c
--- lib/filenamecat.c   6 Jul 2006 02:17:59 -0000       1.3
+++ lib/filenamecat.c   18 Sep 2006 18:00:24 -0000
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "filenamecat.h"
Index: lib/fnmatch.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/fnmatch.c,v
retrieving revision 1.16
diff -u -p -r1.16 fnmatch.c
--- lib/fnmatch.c       7 Jul 2006 02:46:50 -0000       1.16
+++ lib/fnmatch.c       18 Sep 2006 18:00:24 -0000
@@ -15,7 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 
Index: lib/ftruncate.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/ftruncate.c,v
retrieving revision 1.4
diff -u -p -r1.4 ftruncate.c
--- lib/ftruncate.c     4 Oct 2005 02:34:53 -0000       1.4
+++ lib/ftruncate.c     18 Sep 2006 18:00:24 -0000
@@ -1,9 +1,7 @@
 /* ftruncate emulations that work on some System V's.
    This file is in the public domain.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <fcntl.h>
Index: lib/gai_strerror.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/gai_strerror.c,v
retrieving revision 1.3
diff -u -p -r1.3 gai_strerror.c
--- lib/gai_strerror.c  20 Mar 2006 02:21:56 -0000      1.3
+++ lib/gai_strerror.c  18 Sep 2006 18:00:24 -0000
@@ -16,11 +16,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef _LIBC
+# include <config.h>
 # include "getaddrinfo.h"
 #endif
 
Index: lib/getcwd.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getcwd.c,v
retrieving revision 1.11
diff -u -p -r1.11 getcwd.c
--- lib/getcwd.c        11 Jul 2006 16:40:33 -0000      1.11
+++ lib/getcwd.c        18 Sep 2006 18:00:24 -0000
@@ -16,11 +16,8 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #if !_LIBC
+# include <config.h>
 # include "getcwd.h"
 #endif
 
Index: lib/getdate.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getdate.c,v
retrieving revision 1.47
diff -u -p -r1.47 getdate.c
--- lib/getdate.c       7 Jul 2006 02:46:50 -0000       1.47
+++ lib/getdate.c       18 Sep 2006 18:00:25 -0000
@@ -137,9 +137,7 @@
 /* FIXME: Check for arithmetic overflow in all cases, not just
    some of them.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "getdate.h"
 
@@ -326,7 +324,7 @@ static long int time_zone_hhmm (textint,
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 215 "getdate.y"
+#line 213 "getdate.y"
 typedef union YYSTYPE {
   long int intval;
   textint textintval;
@@ -334,7 +332,7 @@ typedef union YYSTYPE {
   relative_time rel;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 338 "getdate.c"
+#line 336 "getdate.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -346,7 +344,7 @@ typedef union YYSTYPE {
 
 
 /* Line 219 of yacc.c.  */
-#line 350 "getdate.c"
+#line 348 "getdate.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -594,14 +592,14 @@ static const yysigned_char yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   241,   241,   242,   246,   253,   255,   259,   261,   263,
-     265,   267,   269,   271,   275,   283,   291,   301,   308,   320,
-     325,   333,   335,   345,   347,   349,   354,   359,   364,   369,
-     377,   382,   402,   409,   417,   425,   430,   436,   441,   450,
-     460,   473,   475,   477,   479,   481,   483,   485,   487,   489,
-     491,   493,   495,   497,   499,   501,   503,   505,   507,   509,
-     511,   513,   517,   519,   521,   523,   525,   527,   531,   531,
-     534,   535,   540,   541,   546,   584,   585,   591,   592
+       0,   239,   239,   240,   244,   251,   253,   257,   259,   261,
+     263,   265,   267,   269,   273,   281,   289,   299,   306,   318,
+     323,   331,   333,   343,   345,   347,   352,   357,   362,   367,
+     375,   380,   400,   407,   415,   423,   428,   434,   439,   448,
+     458,   471,   473,   475,   477,   479,   481,   483,   485,   487,
+     489,   491,   493,   495,   497,   499,   501,   503,   505,   507,
+     509,   511,   515,   517,   519,   521,   523,   525,   529,   529,
+     532,   533,   538,   539,   544,   582,   583,   589,   590
 };
 #endif
 
@@ -1422,67 +1420,67 @@ yyreduce:
   switch (yyn)
     {
         case 4:
-#line 247 "getdate.y"
+#line 245 "getdate.y"
     {
        pc->seconds = (yyvsp[0].timespec);
        pc->timespec_seen = true;
-      }
+      ;}
     break;
 
   case 7:
-#line 260 "getdate.y"
-    { pc->times_seen++; }
+#line 258 "getdate.y"
+    { pc->times_seen++; ;}
     break;
 
   case 8:
-#line 262 "getdate.y"
-    { pc->local_zones_seen++; }
+#line 260 "getdate.y"
+    { pc->local_zones_seen++; ;}
     break;
 
   case 9:
-#line 264 "getdate.y"
-    { pc->zones_seen++; }
+#line 262 "getdate.y"
+    { pc->zones_seen++; ;}
     break;
 
   case 10:
-#line 266 "getdate.y"
-    { pc->dates_seen++; }
+#line 264 "getdate.y"
+    { pc->dates_seen++; ;}
     break;
 
   case 11:
-#line 268 "getdate.y"
-    { pc->days_seen++; }
+#line 266 "getdate.y"
+    { pc->days_seen++; ;}
     break;
 
   case 12:
-#line 270 "getdate.y"
-    { pc->rels_seen = true; }
+#line 268 "getdate.y"
+    { pc->rels_seen = true; ;}
     break;
 
   case 14:
-#line 276 "getdate.y"
+#line 274 "getdate.y"
     {
        pc->hour = (yyvsp[-1].textintval).value;
        pc->minutes = 0;
        pc->seconds.tv_sec = 0;
        pc->seconds.tv_nsec = 0;
        pc->meridian = (yyvsp[0].intval);
-      }
+      ;}
     break;
 
   case 15:
-#line 284 "getdate.y"
+#line 282 "getdate.y"
     {
        pc->hour = (yyvsp[-3].textintval).value;
        pc->minutes = (yyvsp[-1].textintval).value;
        pc->seconds.tv_sec = 0;
        pc->seconds.tv_nsec = 0;
        pc->meridian = (yyvsp[0].intval);
-      }
+      ;}
     break;
 
   case 16:
-#line 292 "getdate.y"
+#line 290 "getdate.y"
     {
        pc->hour = (yyvsp[-4].textintval).value;
        pc->minutes = (yyvsp[-2].textintval).value;
@@ -1491,21 +1489,21 @@ yyreduce:
        pc->meridian = MER24;
        pc->zones_seen++;
        pc->time_zone = time_zone_hhmm ((yyvsp[-1].textintval), 
(yyvsp[0].intval));
-      }
+      ;}
     break;
 
   case 17:
-#line 302 "getdate.y"
+#line 300 "getdate.y"
     {
        pc->hour = (yyvsp[-5].textintval).value;
        pc->minutes = (yyvsp[-3].textintval).value;
        pc->seconds = (yyvsp[-1].timespec);
        pc->meridian = (yyvsp[0].intval);
-      }
+      ;}
     break;
 
   case 18:
-#line 309 "getdate.y"
+#line 307 "getdate.y"
     {
        pc->hour = (yyvsp[-6].textintval).value;
        pc->minutes = (yyvsp[-4].textintval).value;
@@ -1513,32 +1511,32 @@ yyreduce:
        pc->meridian = MER24;
        pc->zones_seen++;
        pc->time_zone = time_zone_hhmm ((yyvsp[-1].textintval), 
(yyvsp[0].intval));
-      }
+      ;}
     break;
 
   case 19:
-#line 321 "getdate.y"
+#line 319 "getdate.y"
     {
        pc->local_isdst = (yyvsp[0].intval);
        pc->dsts_seen += (0 < (yyvsp[0].intval));
-      }
+      ;}
     break;
 
   case 20:
-#line 326 "getdate.y"
+#line 324 "getdate.y"
     {
        pc->local_isdst = 1;
        pc->dsts_seen += (0 < (yyvsp[-1].intval)) + 1;
-      }
+      ;}
     break;
 
   case 21:
-#line 334 "getdate.y"
-    { pc->time_zone = (yyvsp[0].intval); }
+#line 332 "getdate.y"
+    { pc->time_zone = (yyvsp[0].intval); ;}
     break;
 
   case 22:
-#line 336 "getdate.y"
+#line 334 "getdate.y"
     { pc->time_zone = (yyvsp[-1].intval);
        pc->rel.ns += (yyvsp[0].rel).ns;
        pc->rel.seconds += (yyvsp[0].rel).seconds;
@@ -1547,66 +1545,66 @@ yyreduce:
        pc->rel.day += (yyvsp[0].rel).day;
        pc->rel.month += (yyvsp[0].rel).month;
        pc->rel.year += (yyvsp[0].rel).year;
-        pc->rels_seen = true; }
+        pc->rels_seen = true; ;}
     break;
 
   case 23:
-#line 346 "getdate.y"
-    { pc->time_zone = (yyvsp[-2].intval) + time_zone_hhmm 
((yyvsp[-1].textintval), (yyvsp[0].intval)); }
+#line 344 "getdate.y"
+    { pc->time_zone = (yyvsp[-2].intval) + time_zone_hhmm 
((yyvsp[-1].textintval), (yyvsp[0].intval)); ;}
     break;
 
   case 24:
-#line 348 "getdate.y"
-    { pc->time_zone = (yyvsp[0].intval) + 60; }
+#line 346 "getdate.y"
+    { pc->time_zone = (yyvsp[0].intval) + 60; ;}
     break;
 
   case 25:
-#line 350 "getdate.y"
-    { pc->time_zone = (yyvsp[-1].intval) + 60; }
+#line 348 "getdate.y"
+    { pc->time_zone = (yyvsp[-1].intval) + 60; ;}
     break;
 
   case 26:
-#line 355 "getdate.y"
+#line 353 "getdate.y"
     {
        pc->day_ordinal = 1;
        pc->day_number = (yyvsp[0].intval);
-      }
+      ;}
     break;
 
   case 27:
-#line 360 "getdate.y"
+#line 358 "getdate.y"
     {
        pc->day_ordinal = 1;
        pc->day_number = (yyvsp[-1].intval);
-      }
+      ;}
     break;
 
   case 28:
-#line 365 "getdate.y"
+#line 363 "getdate.y"
     {
        pc->day_ordinal = (yyvsp[-1].intval);
        pc->day_number = (yyvsp[0].intval);
-      }
+      ;}
     break;
 
   case 29:
-#line 370 "getdate.y"
+#line 368 "getdate.y"
     {
        pc->day_ordinal = (yyvsp[-1].textintval).value;
        pc->day_number = (yyvsp[0].intval);
-      }
+      ;}
     break;
 
   case 30:
-#line 378 "getdate.y"
+#line 376 "getdate.y"
     {
        pc->month = (yyvsp[-2].textintval).value;
        pc->day = (yyvsp[0].textintval).value;
-      }
+      ;}
     break;
 
   case 31:
-#line 383 "getdate.y"
+#line 381 "getdate.y"
     {
        /* Interpret as YYYY/MM/DD if the first value has 4 or more digits,
           otherwise as MM/DD/YY.
@@ -1625,77 +1623,77 @@ yyreduce:
            pc->day = (yyvsp[-2].textintval).value;
            pc->year = (yyvsp[0].textintval);
          }
-      }
+      ;}
     break;
 
   case 32:
-#line 403 "getdate.y"
+#line 401 "getdate.y"
     {
        /* ISO 8601 format.  YYYY-MM-DD.  */
        pc->year = (yyvsp[-2].textintval);
        pc->month = -(yyvsp[-1].textintval).value;
        pc->day = -(yyvsp[0].textintval).value;
-      }
+      ;}
     break;
 
   case 33:
-#line 410 "getdate.y"
+#line 408 "getdate.y"
     {
        /* e.g. 17-JUN-1992.  */
        pc->day = (yyvsp[-2].textintval).value;
        pc->month = (yyvsp[-1].intval);
        pc->year.value = -(yyvsp[0].textintval).value;
        pc->year.digits = (yyvsp[0].textintval).digits;
-      }
+      ;}
     break;
 
   case 34:
-#line 418 "getdate.y"
+#line 416 "getdate.y"
     {
        /* e.g. JUN-17-1992.  */
        pc->month = (yyvsp[-2].intval);
        pc->day = -(yyvsp[-1].textintval).value;
        pc->year.value = -(yyvsp[0].textintval).value;
        pc->year.digits = (yyvsp[0].textintval).digits;
-      }
+      ;}
     break;
 
   case 35:
-#line 426 "getdate.y"
+#line 424 "getdate.y"
     {
        pc->month = (yyvsp[-1].intval);
        pc->day = (yyvsp[0].textintval).value;
-      }
+      ;}
     break;
 
   case 36:
-#line 431 "getdate.y"
+#line 429 "getdate.y"
     {
        pc->month = (yyvsp[-3].intval);
        pc->day = (yyvsp[-2].textintval).value;
        pc->year = (yyvsp[0].textintval);
-      }
+      ;}
     break;
 
   case 37:
-#line 437 "getdate.y"
+#line 435 "getdate.y"
     {
        pc->day = (yyvsp[-1].textintval).value;
        pc->month = (yyvsp[0].intval);
-      }
+      ;}
     break;
 
   case 38:
-#line 442 "getdate.y"
+#line 440 "getdate.y"
     {
        pc->day = (yyvsp[-2].textintval).value;
        pc->month = (yyvsp[-1].intval);
        pc->year = (yyvsp[0].textintval);
-      }
+      ;}
     break;
 
   case 39:
-#line 451 "getdate.y"
+#line 449 "getdate.y"
     {
        pc->rel.ns -= (yyvsp[-1].rel).ns;
        pc->rel.seconds -= (yyvsp[-1].rel).seconds;
@@ -1704,11 +1702,11 @@ yyreduce:
        pc->rel.day -= (yyvsp[-1].rel).day;
        pc->rel.month -= (yyvsp[-1].rel).month;
        pc->rel.year -= (yyvsp[-1].rel).year;
-      }
+      ;}
     break;
 
   case 40:
-#line 461 "getdate.y"
+#line 459 "getdate.y"
     {
        pc->rel.ns += (yyvsp[0].rel).ns;
        pc->rel.seconds += (yyvsp[0].rel).seconds;
@@ -1717,151 +1715,151 @@ yyreduce:
        pc->rel.day += (yyvsp[0].rel).day;
        pc->rel.month += (yyvsp[0].rel).month;
        pc->rel.year += (yyvsp[0].rel).year;
-      }
+      ;}
     break;
 
   case 41:
-#line 474 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].intval); }
+#line 472 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].intval); ;}
     break;
 
   case 42:
-#line 476 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 
(yyvsp[-1].textintval).value; }
+#line 474 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 
(yyvsp[-1].textintval).value; ;}
     break;
 
   case 43:
-#line 478 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; }
+#line 476 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; ;}
     break;
 
   case 44:
-#line 480 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].intval); }
+#line 478 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].intval); ;}
     break;
 
   case 45:
-#line 482 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 
(yyvsp[-1].textintval).value; }
+#line 480 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 
(yyvsp[-1].textintval).value; ;}
     break;
 
   case 46:
-#line 484 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; }
+#line 482 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; ;}
     break;
 
   case 47:
-#line 486 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].intval) * 
(yyvsp[0].intval); }
+#line 484 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].intval) * 
(yyvsp[0].intval); ;}
     break;
 
   case 48:
-#line 488 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = 
(yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 486 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = 
(yyvsp[-1].textintval).value * (yyvsp[0].intval); ;}
     break;
 
   case 49:
-#line 490 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); }
+#line 488 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); ;}
     break;
 
   case 50:
-#line 492 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].intval); }
+#line 490 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].intval); ;}
     break;
 
   case 51:
-#line 494 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 
(yyvsp[-1].textintval).value; }
+#line 492 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 
(yyvsp[-1].textintval).value; ;}
     break;
 
   case 52:
-#line 496 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; }
+#line 494 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; ;}
     break;
 
   case 53:
-#line 498 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].intval); 
}
+#line 496 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].intval); 
;}
     break;
 
   case 54:
-#line 500 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 
(yyvsp[-1].textintval).value; }
+#line 498 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 
(yyvsp[-1].textintval).value; ;}
     break;
 
   case 55:
-#line 502 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; }
+#line 500 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; ;}
     break;
 
   case 56:
-#line 504 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].intval); 
}
+#line 502 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].intval); 
;}
     break;
 
   case 57:
-#line 506 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 
(yyvsp[-1].textintval).value; }
+#line 504 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 
(yyvsp[-1].textintval).value; ;}
     break;
 
   case 58:
-#line 508 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 
(yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; }
+#line 506 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 
(yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; ;}
     break;
 
   case 59:
-#line 510 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 
(yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; }
+#line 508 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 
(yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; ;}
     break;
 
   case 60:
-#line 512 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; }
+#line 510 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; ;}
     break;
 
   case 62:
-#line 518 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 
(yyvsp[-1].textintval).value; }
+#line 516 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 
(yyvsp[-1].textintval).value; ;}
     break;
 
   case 63:
-#line 520 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 
(yyvsp[-1].textintval).value; }
+#line 518 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 
(yyvsp[-1].textintval).value; ;}
     break;
 
   case 64:
-#line 522 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = 
(yyvsp[-1].textintval).value * (yyvsp[0].intval); }
+#line 520 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = 
(yyvsp[-1].textintval).value * (yyvsp[0].intval); ;}
     break;
 
   case 65:
-#line 524 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 
(yyvsp[-1].textintval).value; }
+#line 522 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 
(yyvsp[-1].textintval).value; ;}
     break;
 
   case 66:
-#line 526 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 
(yyvsp[-1].textintval).value; }
+#line 524 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 
(yyvsp[-1].textintval).value; ;}
     break;
 
   case 67:
-#line 528 "getdate.y"
-    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 
(yyvsp[-1].textintval).value; }
+#line 526 "getdate.y"
+    { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 
(yyvsp[-1].textintval).value; ;}
     break;
 
   case 71:
-#line 536 "getdate.y"
-    { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; 
(yyval.timespec).tv_nsec = 0; }
+#line 534 "getdate.y"
+    { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; 
(yyval.timespec).tv_nsec = 0; ;}
     break;
 
   case 73:
-#line 542 "getdate.y"
-    { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; 
(yyval.timespec).tv_nsec = 0; }
+#line 540 "getdate.y"
+    { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; 
(yyval.timespec).tv_nsec = 0; ;}
     break;
 
   case 74:
-#line 547 "getdate.y"
+#line 545 "getdate.y"
     {
        if (pc->dates_seen && ! pc->year.digits
            && ! pc->rels_seen && (pc->times_seen || 2 < 
(yyvsp[0].textintval).digits))
@@ -1894,27 +1892,27 @@ yyreduce:
                pc->meridian = MER24;
              }
          }
-      }
+      ;}
     break;
 
   case 75:
-#line 584 "getdate.y"
-    { (yyval.intval) = -1; }
+#line 582 "getdate.y"
+    { (yyval.intval) = -1; ;}
     break;
 
   case 76:
-#line 586 "getdate.y"
-    { (yyval.intval) = (yyvsp[0].textintval).value; }
+#line 584 "getdate.y"
+    { (yyval.intval) = (yyvsp[0].textintval).value; ;}
     break;
 
   case 77:
-#line 591 "getdate.y"
-    { (yyval.intval) = MER24; }
+#line 589 "getdate.y"
+    { (yyval.intval) = MER24; ;}
     break;
 
   case 78:
-#line 593 "getdate.y"
-    { (yyval.intval) = (yyvsp[0].intval); }
+#line 591 "getdate.y"
+    { (yyval.intval) = (yyvsp[0].intval); ;}
     break;
 
 
@@ -1922,7 +1920,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 1926 "getdate.c"
+#line 1924 "getdate.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -2190,7 +2188,7 @@ yyreturn:
 }
 
 
-#line 596 "getdate.y"
+#line 594 "getdate.y"
 
 
 static table const meridian_table[] =
Index: lib/getdate.y
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getdate.y,v
retrieving revision 1.38
diff -u -p -r1.38 getdate.y
--- lib/getdate.y       7 Jul 2006 02:46:50 -0000       1.38
+++ lib/getdate.y       18 Sep 2006 18:00:25 -0000
@@ -32,9 +32,7 @@
 /* FIXME: Check for arithmetic overflow in all cases, not just
    some of them.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "getdate.h"
 
Index: lib/gethostname.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/gethostname.c,v
retrieving revision 1.4
diff -u -p -r1.4 gethostname.c
--- lib/gethostname.c   23 May 2005 17:44:31 -0000      1.4
+++ lib/gethostname.c   18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,6 @@
 /* gethostname emulation for SysV and POSIX.1.
-   Copyright (C) 1992, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 1992, 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* David MacKenzie <address@hidden> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifdef HAVE_UNAME
 # include <sys/utsname.h>
Index: lib/getlogin_r.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getlogin_r.c,v
retrieving revision 1.5
diff -u -p -r1.5 getlogin_r.c
--- lib/getlogin_r.c    20 Mar 2006 02:21:56 -0000      1.5
+++ lib/getlogin_r.c    18 Sep 2006 18:00:25 -0000
@@ -1,6 +1,6 @@
 /* Provide a working getlogin_r for systems which lack it.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,7 @@
 
 /* written by Paul Eggert and Derek Price */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "getlogin_r.h"
 
Index: lib/getndelim2.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getndelim2.c,v
retrieving revision 1.10
diff -u -p -r1.10 getndelim2.c
--- lib/getndelim2.c    21 Aug 2006 19:22:22 -0000      1.10
+++ lib/getndelim2.c    18 Sep 2006 18:00:25 -0000
@@ -20,9 +20,7 @@
 
 /* Originally written by Jan Brittenson, address@hidden  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "getndelim2.h"
 
Index: lib/getnline.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getnline.c,v
retrieving revision 1.10
diff -u -p -r1.10 getnline.c
--- lib/getnline.c      19 Sep 2005 21:26:13 -0000      1.10
+++ lib/getnline.c      18 Sep 2006 18:00:25 -0000
@@ -1,6 +1,6 @@
 /* getnline - Read a line from a stream, with bounded memory allocation.
 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "getnline.h"
Index: lib/getopt.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getopt.c,v
retrieving revision 1.11
diff -u -p -r1.11 getopt.c
--- lib/getopt.c        7 Jul 2006 02:46:50 -0000       1.11
+++ lib/getopt.c        18 Sep 2006 18:00:25 -0000
@@ -20,7 +20,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 
Index: lib/getopt1.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getopt1.c,v
retrieving revision 1.7
diff -u -p -r1.7 getopt1.c
--- lib/getopt1.c       19 Sep 2005 21:26:13 -0000      1.7
+++ lib/getopt1.c       18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004,2006
      Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -17,13 +17,10 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifdef _LIBC
 # include <getopt.h>
 #else
+# include <config.h>
 # include "getopt.h"
 #endif
 #include "getopt_int.h"
Index: lib/getpass.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/getpass.c,v
retrieving revision 1.12
diff -u -p -r1.12 getpass.c
--- lib/getpass.c       4 Jun 2006 09:25:48 -0000       1.12
+++ lib/getpass.c       18 Sep 2006 18:00:25 -0000
@@ -1,4 +1,6 @@
-/* Copyright (C) 1992-2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2001, 2003, 2004, 2005, 2006 Free Software
+   Foundation, Inc.
+
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -15,7 +17,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 
Index: lib/gettime.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/gettime.c,v
retrieving revision 1.5
diff -u -p -r1.5 gettime.c
--- lib/gettime.c       25 Jan 2006 12:53:38 -0000      1.5
+++ lib/gettime.c       18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,6 @@
 /* gettime -- get the system clock
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "timespec.h"
 
Index: lib/gettimeofday.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/gettimeofday.c,v
retrieving revision 1.3
diff -u -p -r1.3 gettimeofday.c
--- lib/gettimeofday.c  19 Sep 2005 21:26:13 -0000      1.3
+++ lib/gettimeofday.c  18 Sep 2006 18:00:25 -0000
@@ -2,7 +2,8 @@
    static buffer that localtime uses for it's return value.  The gettimeofday
    function from Mac OS X 10.0.4, i.e. Darwin 1.3.7 has this problem.
    The tzset replacement is necessary for at least Solaris 2.5, 2.5.1, and 2.6.
-   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,9 +21,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Disable the definitions of these functions (from config.h)
    so we can use the library versions here.  */
Index: lib/glob.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/glob.c,v
retrieving revision 1.22
diff -u -p -r1.22 glob.c
--- lib/glob.c  11 Jul 2006 16:40:33 -0000      1.22
+++ lib/glob.c  18 Sep 2006 18:00:25 -0000
@@ -16,7 +16,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 
Index: lib/inet_ntop.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/inet_ntop.c,v
retrieving revision 1.1
diff -u -p -r1.1 inet_ntop.c
--- lib/inet_ntop.c     29 Jun 2006 12:13:26 -0000      1.1
+++ lib/inet_ntop.c     18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,6 @@
 /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
-   Copyright (c) 2005, 2006  Free Software Foundation, Inc.
+
+   Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,9 +33,7 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "inet_ntop.h"
Index: lib/lchown.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/lchown.c,v
retrieving revision 1.1
diff -u -p -r1.1 lchown.c
--- lib/lchown.c        24 Aug 2006 01:24:14 -0000      1.1
+++ lib/lchown.c        18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,7 @@
 /* Provide a stub lchown function for systems that lack it.
-   Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 1998, 1999, 2002, 2004, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
Index: lib/lstat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/lstat.c,v
retrieving revision 1.6
diff -u -p -r1.6 lstat.c
--- lib/lstat.c 20 Mar 2006 02:21:56 -0000      1.6
+++ lib/lstat.c 18 Sep 2006 18:00:25 -0000
@@ -19,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* The specification of these functions is in sys_stat.h.  But we cannot
    include this include file here, because on some systems, a
Index: lib/malloc.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/malloc.c,v
retrieving revision 1.5
diff -u -p -r1.5 malloc.c
--- lib/malloc.c        19 Sep 2005 21:26:13 -0000      1.5
+++ lib/malloc.c        18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,6 @@
 /* malloc() function that is glibc compatible.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+
+   Copyright (C) 1997, 1998, 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
@@ -17,9 +18,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef malloc
 
 #include <stdlib.h>
Index: lib/mbchar.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mbchar.c,v
retrieving revision 1.1
diff -u -p -r1.1 mbchar.c
--- lib/mbchar.c        4 Sep 2005 05:58:56 -0000       1.1
+++ lib/mbchar.c        18 Sep 2006 18:00:25 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 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
@@ -15,9 +15,7 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <limits.h>
 
Index: lib/md5.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/md5.c,v
retrieving revision 1.14
diff -u -p -r1.14 md5.c
--- lib/md5.c   25 Jan 2006 12:53:38 -0000      1.14
+++ lib/md5.c   18 Sep 2006 18:00:25 -0000
@@ -20,9 +20,7 @@
 
 /* Written by Ulrich Drepper <address@hidden>, 1995.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "md5.h"
 
Index: lib/memchr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/memchr.c,v
retrieving revision 1.1
diff -u -p -r1.1 memchr.c
--- lib/memchr.c        4 Sep 2005 05:58:56 -0000       1.1
+++ lib/memchr.c        18 Sep 2006 18:00:25 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004 Free
+/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2006 Free
    Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (address@hidden),
@@ -24,7 +24,7 @@ You should have received a copy of the G
 along with this program; if not, write to the Free Software Foundation,
 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 
Index: lib/memmove.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/memmove.c,v
retrieving revision 1.7
diff -u -p -r1.7 memmove.c
--- lib/memmove.c       19 Sep 2005 21:26:13 -0000      1.7
+++ lib/memmove.c       18 Sep 2006 18:00:25 -0000
@@ -3,9 +3,7 @@
    In the public domain.
    By David MacKenzie <address@hidden>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stddef.h>
 
Index: lib/memrchr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/memrchr.c,v
retrieving revision 1.2
diff -u -p -r1.2 memrchr.c
--- lib/memrchr.c       23 May 2005 17:44:31 -0000      1.2
+++ lib/memrchr.c       18 Sep 2006 18:00:25 -0000
@@ -1,7 +1,7 @@
 /* memrchr -- find the last occurrence of a byte in a memory block
 
-   Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (address@hidden),
    with help from Dan Sahlin (address@hidden) and
@@ -23,14 +23,11 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #if defined _LIBC
 # include <string.h>
 # include <memcopy.h>
 #else
+# include <config.h>
 # include "memrchr.h"
 # define reg_char char
 #endif
Index: lib/mkdir.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mkdir.c,v
retrieving revision 1.7
diff -u -p -r1.7 mkdir.c
--- lib/mkdir.c 19 Sep 2005 21:26:13 -0000      1.7
+++ lib/mkdir.c 18 Sep 2006 18:00:25 -0000
@@ -1,7 +1,7 @@
 /* On some systems, mkdir ("foo/", 0700) fails because of the trailing
    slash.  On those systems, this wrapper removes the trailing slash.
 
-   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Disable the definition of mkdir to rpl_mkdir (from config.h) in this
    file.  Otherwise, we'd get conflicting prototypes for rpl_mkdir on
Index: lib/mkdirat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mkdirat.c,v
retrieving revision 1.2
diff -u -p -r1.2 mkdirat.c
--- lib/mkdirat.c       21 Aug 2006 19:22:22 -0000      1.2
+++ lib/mkdirat.c       18 Sep 2006 18:00:25 -0000
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "openat.h"
 
Index: lib/mkstemp.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mkstemp.c,v
retrieving revision 1.5
diff -u -p -r1.5 mkstemp.c
--- lib/mkstemp.c       19 Sep 2005 21:26:13 -0000      1.5
+++ lib/mkstemp.c       18 Sep 2006 18:00:25 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2001, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2001, 2005, 2006 Free Software Foundation, Inc.
    This file is derived from the one in the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -15,9 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Disable the definition of mkstemp to rpl_mkstemp (from config.h) in this
    file.  Otherwise, we'd get conflicting prototypes for rpl_mkstemp on
Index: lib/mktime.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/mktime.c,v
retrieving revision 1.12
diff -u -p -r1.12 mktime.c
--- lib/mktime.c        19 Sep 2005 16:24:56 -0000      1.12
+++ lib/mktime.c        18 Sep 2006 18:00:25 -0000
@@ -1,7 +1,7 @@
 /* Convert a `struct tm' to a time_t value.
-   Copyright (C) 1993-1999, 2002-2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1993-1999, 2002-2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Paul Eggert (address@hidden).
+   Contributed by Paul Eggert <address@hidden>.
 
    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
@@ -215,10 +215,11 @@ guess_time_tm (long int year, long int y
   /* Overflow occurred one way or another.  Return the nearest result
      that is actually in range, except don't report a zero difference
      if the actual difference is nonzero, as that would cause a false
-     match.  */
+     match; and don't oscillate between two values, as that would
+     confuse the spring-forward gap detector.  */
   return (*t < TIME_T_MIDPOINT
-         ? TIME_T_MIN + (*t == TIME_T_MIN)
-         : TIME_T_MAX - (*t == TIME_T_MAX));
+         ? (*t <= TIME_T_MIN + 1 ? *t + 1 : TIME_T_MIN)
+         : (TIME_T_MAX - 1 <= *t ? *t - 1 : TIME_T_MAX));
 }
 
 /* Use CONVERT to convert *T to a broken down time in *TP.
Index: lib/nanosleep.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/nanosleep.c,v
retrieving revision 1.9
diff -u -p -r1.9 nanosleep.c
--- lib/nanosleep.c     2 Sep 2006 23:17:59 -0000       1.9
+++ lib/nanosleep.c     18 Sep 2006 18:00:25 -0000
@@ -19,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Undefine nanosleep here so any prototype is not redefined to be a
    prototype for rpl_nanosleep. (they'd conflict e.g., on alpha-dec-osf3.2)  */
@@ -29,10 +27,10 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <sys/types.h>
 #if HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
-#include <sys/types.h>
 #include <signal.h>
 
 #if TIME_WITH_SYS_TIME
Index: lib/open-safer.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/open-safer.c,v
retrieving revision 1.1
diff -u -p -r1.1 open-safer.c
--- lib/open-safer.c    4 Oct 2005 02:34:54 -0000       1.1
+++ lib/open-safer.c    18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,6 @@
 /* Invoke open, but avoid some glitches.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "fcntl-safer.h"
 
Index: lib/openat-die.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/openat-die.c,v
retrieving revision 1.1
diff -u -p -r1.1 openat-die.c
--- lib/openat-die.c    4 Oct 2005 02:34:54 -0000       1.1
+++ lib/openat-die.c    18 Sep 2006 18:00:25 -0000
@@ -1,6 +1,6 @@
 /* Report a save- or restore-cwd failure in our openat replacement and then 
exit.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdlib.h>
 
Index: lib/openat.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/openat.c,v
retrieving revision 1.8
diff -u -p -r1.8 openat.c
--- lib/openat.c        21 Aug 2006 19:22:22 -0000      1.8
+++ lib/openat.c        18 Sep 2006 18:00:25 -0000
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "openat.h"
 
Index: lib/pagealign_alloc.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/pagealign_alloc.c,v
retrieving revision 1.5
diff -u -p -r1.5 pagealign_alloc.c
--- lib/pagealign_alloc.c       20 Mar 2006 02:21:56 -0000      1.5
+++ lib/pagealign_alloc.c       18 Sep 2006 18:00:25 -0000
@@ -1,6 +1,6 @@
 /* Memory allocation aligned to system page boundaries.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -19,9 +19,7 @@
 
 /* Written by Derek R. Price <address@hidden>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "pagealign_alloc.h"
 
Index: lib/pipe-safer.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/pipe-safer.c,v
retrieving revision 1.3
diff -u -p -r1.3 pipe-safer.c
--- lib/pipe-safer.c    16 Aug 2006 18:12:09 -0000      1.3
+++ lib/pipe-safer.c    18 Sep 2006 18:00:25 -0000
@@ -17,9 +17,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "unistd-safer.h"
 
Index: lib/printf-args.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/printf-args.c,v
retrieving revision 1.4
diff -u -p -r1.4 printf-args.c
--- lib/printf-args.c   16 Aug 2006 18:12:09 -0000      1.4
+++ lib/printf-args.c   18 Sep 2006 18:00:25 -0000
@@ -15,9 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "printf-args.h"
Index: lib/printf-parse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/printf-parse.c,v
retrieving revision 1.2
diff -u -p -r1.2 printf-parse.c
--- lib/printf-parse.c  23 May 2005 17:44:32 -0000      1.2
+++ lib/printf-parse.c  18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #if WIDE_CHAR_VERSION
Index: lib/quotearg.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/quotearg.c,v
retrieving revision 1.6
diff -u -p -r1.6 quotearg.c
--- lib/quotearg.c      25 Jan 2006 12:53:38 -0000      1.6
+++ lib/quotearg.c      18 Sep 2006 18:00:25 -0000
@@ -19,9 +19,7 @@
 
 /* Written by Paul Eggert <address@hidden> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "quotearg.h"
 
Index: lib/readlink.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/readlink.c,v
retrieving revision 1.5
diff -u -p -r1.5 readlink.c
--- lib/readlink.c      16 Aug 2006 18:12:09 -0000      1.5
+++ lib/readlink.c      18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,5 @@
 /* Stub for readlink().
-   Copyright (C) 2003-2005 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <sys/types.h>
Index: lib/realloc.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/realloc.c,v
retrieving revision 1.5
diff -u -p -r1.5 realloc.c
--- lib/realloc.c       19 Sep 2005 21:26:13 -0000      1.5
+++ lib/realloc.c       18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,6 @@
 /* realloc() function that is glibc compatible.
-   Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc.
+
+   Copyright (C) 1997, 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
@@ -17,9 +18,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef realloc
 
 #include <stdlib.h>
Index: lib/regex.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/regex.c,v
retrieving revision 1.23
diff -u -p -r1.23 regex.c
--- lib/regex.c 11 Apr 2006 20:21:31 -0000      1.23
+++ lib/regex.c 18 Sep 2006 18:00:25 -0000
@@ -17,9 +17,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Make sure noone compiles this code with a C++ compiler.  */
 #if defined __cplusplus && defined _LIBC
Index: lib/regex_internal.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/regex_internal.c,v
retrieving revision 1.9
diff -u -p -r1.9 regex_internal.c
--- lib/regex_internal.c        16 Aug 2006 18:12:09 -0000      1.9
+++ lib/regex_internal.c        18 Sep 2006 18:00:25 -0000
@@ -1340,7 +1340,6 @@ static Idx
 internal_function
 re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
 {
-  int type = token.type;
   if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0))
     {
       size_t new_nodes_alloc = dfa->nodes_alloc * 2;
@@ -1376,8 +1375,11 @@ re_dfa_add_node (re_dfa_t *dfa, re_token
   dfa->nodes[dfa->nodes_len] = token;
   dfa->nodes[dfa->nodes_len].constraint = 0;
 #ifdef RE_ENABLE_I18N
+  {
+  int type = token.type;
   dfa->nodes[dfa->nodes_len].accept_mb =
     (type == OP_PERIOD && dfa->mb_cur_max > 1) || type == COMPLEX_BRACKET;
+  }
 #endif
   dfa->nexts[dfa->nodes_len] = REG_MISSING;
   re_node_set_init_empty (dfa->edests + dfa->nodes_len);
Index: lib/rename.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/rename.c,v
retrieving revision 1.10
diff -u -p -r1.10 rename.c
--- lib/rename.c        19 Sep 2005 21:26:14 -0000      1.10
+++ lib/rename.c        18 Sep 2006 18:00:25 -0000
@@ -1,7 +1,8 @@
 /* Work around the bug in some systems whereby rename fails when the source
    file has a trailing slash.  The rename functions of SunOS 4.1.1_U1 and
    mips-dec-ultrix4.4 have this bug.
-   Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +20,7 @@
 
 /* written by Volker Borchert */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #undef rename
 
 #include <stdio.h>
Index: lib/rpmatch.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/rpmatch.c,v
retrieving revision 1.5
diff -u -p -r1.5 rpmatch.c
--- lib/rpmatch.c       19 Sep 2005 21:26:14 -0000      1.5
+++ lib/rpmatch.c       18 Sep 2006 18:00:25 -0000
@@ -1,6 +1,8 @@
 /* Determine whether string value is affirmation or negative response
    according to current locale's data.
-   Copyright (C) 1996, 1998, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 1996, 1998, 2000, 2002, 2003, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +18,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stddef.h>
 #include <stdlib.h>
Index: lib/save-cwd.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/save-cwd.c,v
retrieving revision 1.13
diff -u -p -r1.13 save-cwd.c
--- lib/save-cwd.c      25 Jan 2006 12:53:38 -0000      1.13
+++ lib/save-cwd.c      18 Sep 2006 18:00:25 -0000
@@ -1,7 +1,7 @@
 /* save-cwd.c -- Save and restore current working directory.
 
-   Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "save-cwd.h"
 
Index: lib/setenv.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/setenv.c,v
retrieving revision 1.6
diff -u -p -r1.6 setenv.c
--- lib/setenv.c        16 Aug 2006 18:12:09 -0000      1.6
+++ lib/setenv.c        18 Sep 2006 18:00:25 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2003,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2003,2005,2006 Free Software Foundation, 
Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
 # include <config.h>
 #endif
 #include <alloca.h>
Index: lib/snprintf.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/snprintf.c,v
retrieving revision 1.2
diff -u -p -r1.2 snprintf.c
--- lib/snprintf.c      16 Aug 2006 18:12:09 -0000      1.2
+++ lib/snprintf.c      18 Sep 2006 18:00:25 -0000
@@ -16,9 +16,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "snprintf.h"
 
Index: lib/strcasecmp.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strcasecmp.c,v
retrieving revision 1.4
diff -u -p -r1.4 strcasecmp.c
--- lib/strcasecmp.c    20 Oct 2005 21:06:01 -0000      1.4
+++ lib/strcasecmp.c    18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison function.
-   Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2005,
    based on earlier glibc code.
 
@@ -17,9 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "strcase.h"
Index: lib/strdup.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strdup.c,v
retrieving revision 1.5
diff -u -p -r1.5 strdup.c
--- lib/strdup.c        23 May 2005 17:44:32 -0000      1.5
+++ lib/strdup.c        18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004, 2006 Free
+   Software Foundation, Inc.
 
    This file is part of the GNU C Library.
 
@@ -17,11 +17,8 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifndef _LIBC
+# include <config.h>
 /* Get specification.  */
 # include "strdup.h"
 #endif
Index: lib/strerror.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strerror.c,v
retrieving revision 1.7
diff -u -p -r1.7 strerror.c
--- lib/strerror.c      19 Sep 2005 21:26:14 -0000      1.7
+++ lib/strerror.c      18 Sep 2006 18:00:25 -0000
@@ -1,7 +1,7 @@
 /* strerror.c --- ANSI C compatible system error routine
 
-   Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <limits.h>
 
Index: lib/strftime.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strftime.c,v
retrieving revision 1.13
diff -u -p -r1.13 strftime.c
--- lib/strftime.c      7 Jul 2006 02:46:50 -0000       1.13
+++ lib/strftime.c      18 Sep 2006 18:00:25 -0000
@@ -18,10 +18,6 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifdef _LIBC
 # define HAVE_MBLEN 1
 # define HAVE_MBRLEN 1
@@ -32,6 +28,8 @@
 # define HAVE_TZSET 1
 # define MULTIBYTE_IS_FORMAT_SAFE 1
 # include "../locale/localeinfo.h"
+#else
+# include <config.h>
 #endif
 
 #include <ctype.h>
Index: lib/stripslash.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/stripslash.c,v
retrieving revision 1.8
diff -u -p -r1.8 stripslash.c
--- lib/stripslash.c    6 Jul 2006 02:17:59 -0000       1.8
+++ lib/stripslash.c    18 Sep 2006 18:00:25 -0000
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "dirname.h"
 
Index: lib/strncasecmp.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strncasecmp.c,v
retrieving revision 1.4
diff -u -p -r1.4 strncasecmp.c
--- lib/strncasecmp.c   20 Oct 2005 21:06:01 -0000      1.4
+++ lib/strncasecmp.c   18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,5 @@
 /* strncasecmp.c -- case insensitive string comparator
-   Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "strcase.h"
Index: lib/strndup.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strndup.c,v
retrieving revision 1.1
diff -u -p -r1.1 strndup.c
--- lib/strndup.c       6 Jul 2006 02:17:59 -0000       1.1
+++ lib/strndup.c       18 Sep 2006 18:00:25 -0000
@@ -18,10 +18,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
 #if !_LIBC
+# include <config.h>
 # include "strndup.h"
 #endif
 
Index: lib/strnlen.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strnlen.c,v
retrieving revision 1.1
diff -u -p -r1.1 strnlen.c
--- lib/strnlen.c       6 Jul 2006 02:17:59 -0000       1.1
+++ lib/strnlen.c       18 Sep 2006 18:00:25 -0000
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "strnlen.h"
 
Index: lib/strnlen1.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strnlen1.c,v
retrieving revision 1.3
diff -u -p -r1.3 strnlen1.c
--- lib/strnlen1.c      16 Aug 2006 18:12:09 -0000      1.3
+++ lib/strnlen1.c      18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,9 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "strnlen1.h"
Index: lib/strstr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strstr.c,v
retrieving revision 1.5
diff -u -p -r1.5 strstr.c
--- lib/strstr.c        19 Sep 2005 21:26:14 -0000      1.5
+++ lib/strstr.c        18 Sep 2006 18:00:25 -0000
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2005.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "strstr.h"
Index: lib/strtoimax.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strtoimax.c,v
retrieving revision 1.5
diff -u -p -r1.5 strtoimax.c
--- lib/strtoimax.c     21 Aug 2006 19:22:22 -0000      1.5
+++ lib/strtoimax.c     18 Sep 2006 18:00:25 -0000
@@ -19,9 +19,7 @@
 
 /* Written by Paul Eggert. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Verify interface.  */
 #include <inttypes.h>
Index: lib/strtol.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/strtol.c,v
retrieving revision 1.8
diff -u -p -r1.8 strtol.c
--- lib/strtol.c        6 Jul 2006 13:47:56 -0000       1.8
+++ lib/strtol.c        18 Sep 2006 18:00:25 -0000
@@ -20,12 +20,10 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #ifdef _LIBC
 # define USE_NUMBER_GROUPING
+#else
+# include <config.h>
 #endif
 
 #include <ctype.h>
Index: lib/tempname.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/tempname.c,v
retrieving revision 1.10
diff -u -p -r1.10 tempname.c
--- lib/tempname.c      21 Aug 2006 19:22:22 -0000      1.10
+++ lib/tempname.c      18 Sep 2006 18:00:25 -0000
@@ -17,7 +17,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
+#if !_LIBC
 # include <config.h>
 #endif
 
Index: lib/time_r.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/time_r.c,v
retrieving revision 1.5
diff -u -p -r1.5 time_r.c
--- lib/time_r.c        30 Mar 2006 18:13:12 -0000      1.5
+++ lib/time_r.c        18 Sep 2006 18:00:25 -0000
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "time_r.h"
 
Index: lib/unsetenv.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/unsetenv.c,v
retrieving revision 1.5
diff -u -p -r1.5 unsetenv.c
--- lib/unsetenv.c      19 Jun 2006 17:45:58 -0000      1.5
+++ lib/unsetenv.c      18 Sep 2006 18:00:25 -0000
@@ -15,9 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <errno.h>
 #if !_LIBC
Index: lib/vasnprintf.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/vasnprintf.c,v
retrieving revision 1.6
diff -u -p -r1.6 vasnprintf.c
--- lib/vasnprintf.c    2 Sep 2006 23:17:59 -0000       1.6
+++ lib/vasnprintf.c    18 Sep 2006 18:00:25 -0000
@@ -22,9 +22,7 @@
 # define _GNU_SOURCE    1
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #ifndef IN_LIBINTL
 # include <alloca.h>
 #endif
Index: lib/vasprintf.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/vasprintf.c,v
retrieving revision 1.14
diff -u -p -r1.14 vasprintf.c
--- lib/vasprintf.c     2 Sep 2006 23:17:59 -0000       1.14
+++ lib/vasprintf.c     18 Sep 2006 18:00:25 -0000
@@ -15,9 +15,7 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "vasprintf.h"
Index: lib/xalloc-die.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/xalloc-die.c,v
retrieving revision 1.4
diff -u -p -r1.4 xalloc-die.c
--- lib/xalloc-die.c    20 Mar 2006 02:21:56 -0000      1.4
+++ lib/xalloc-die.c    18 Sep 2006 18:00:25 -0000
@@ -17,9 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xalloc.h"
 
Index: lib/xgetcwd.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/xgetcwd.c,v
retrieving revision 1.5
diff -u -p -r1.5 xgetcwd.c
--- lib/xgetcwd.c       19 Sep 2005 21:26:14 -0000      1.5
+++ lib/xgetcwd.c       18 Sep 2006 18:00:25 -0000
@@ -1,6 +1,6 @@
 /* xgetcwd.c -- return current directory with unlimited length
 
-   Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 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
@@ -18,9 +18,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xgetcwd.h"
 
Index: lib/xgethostname.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/xgethostname.c,v
retrieving revision 1.4
diff -u -p -r1.4 xgethostname.c
--- lib/xgethostname.c  4 Oct 2005 02:34:54 -0000       1.4
+++ lib/xgethostname.c  18 Sep 2006 18:00:25 -0000
@@ -1,7 +1,7 @@
 /* xgethostname.c -- return current hostname with unlimited length
 
-   Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2005, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 /* written by Jim Meyering */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "xgethostname.h"
Index: lib/xmalloc.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/xmalloc.c,v
retrieving revision 1.5
diff -u -p -r1.5 xmalloc.c
--- lib/xmalloc.c       19 Sep 2005 21:26:14 -0000      1.5
+++ lib/xmalloc.c       18 Sep 2006 18:00:25 -0000
@@ -1,7 +1,8 @@
 /* xmalloc.c -- malloc with out of memory checking
 
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+   Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +18,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xalloc.h"
 
Index: lib/xreadlink.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/xreadlink.c,v
retrieving revision 1.5
diff -u -p -r1.5 xreadlink.c
--- lib/xreadlink.c     4 Oct 2005 02:34:54 -0000       1.5
+++ lib/xreadlink.c     18 Sep 2006 18:00:25 -0000
@@ -1,6 +1,7 @@
 /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
 
-   Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +20,7 @@
 
 /* Written by Jim Meyering <address@hidden>  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xreadlink.h"
 
Index: lib/yesno.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/yesno.c,v
retrieving revision 1.8
diff -u -p -r1.8 yesno.c
--- lib/yesno.c 19 Sep 2005 21:26:14 -0000      1.8
+++ lib/yesno.c 18 Sep 2006 18:00:25 -0000
@@ -1,7 +1,7 @@
 /* yesno.c -- read a yes/no response from stdin
 
-   Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005, 2006 Free
+   Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "yesno.h"
 
Index: m4/getdate.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/getdate.m4,v
retrieving revision 1.6
diff -u -p -r1.6 getdate.m4
--- m4/getdate.m4       24 Aug 2006 01:24:14 -0000      1.6
+++ m4/getdate.m4       18 Sep 2006 18:00:26 -0000
@@ -1,4 +1,4 @@
-# getdate.m4 serial 10
+# getdate.m4 serial 11
 dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -19,8 +19,6 @@ AC_DEFUN([gl_C_COMPOUND_LITERALS],
 
 AC_DEFUN([gl_GETDATE],
 [
-  AC_LIBOBJ([getdate])
-
   dnl Prerequisites of lib/getdate.h.
   AC_REQUIRE([AM_STDBOOL_H])
   AC_REQUIRE([gl_TIMESPEC])
Index: m4/gnulib-comp.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/gnulib-comp.m4,v
retrieving revision 1.25
diff -u -p -r1.25 gnulib-comp.m4
--- m4/gnulib-comp.m4   2 Sep 2006 23:17:59 -0000       1.25
+++ m4/gnulib-comp.m4   18 Sep 2006 18:00:26 -0000
@@ -32,6 +32,9 @@ AC_DEFUN([gl_EARLY],
 AC_DEFUN([gl_INIT],
 [
   AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
+  gl_cond_libtool=false
+  gl_libdeps=
+  gl_ltlibdeps=
   gl_FUNC_ALLOCA
   gl_ALLOCSA
   gl_HEADER_ARPA_INET
@@ -100,7 +103,7 @@ AC_DEFUN([gl_INIT],
   gl_FUNC_READLINK
   AC_FUNC_REALLOC
   gl_REGEX
-  vb_FUNC_RENAME
+  gl_FUNC_RENAME
   gl_FUNC_RPMATCH
   gl_SAVE_CWD
   gt_FUNC_SETENV
@@ -141,6 +144,10 @@ AC_DEFUN([gl_INIT],
   gl_XSIZE
   gl_XSTRNDUP
   gl_YESNO
+  LIBCVS_LIBDEPS="$gl_libdeps"
+  AC_SUBST([LIBCVS_LIBDEPS])
+  LIBCVS_LTLIBDEPS="$gl_ltlibdeps"
+  AC_SUBST([LIBCVS_LTLIBDEPS])
 ])
 
 # This macro records the list of files which have been installed by
Index: m4/inttypes.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/inttypes.m4,v
retrieving revision 1.4
diff -u -p -r1.4 inttypes.m4
--- m4/inttypes.m4      2 Sep 2006 23:17:59 -0000       1.4
+++ m4/inttypes.m4      18 Sep 2006 18:00:26 -0000
@@ -1,4 +1,4 @@
-# inttypes.m4 serial 4
+# inttypes.m4 serial 5
 dnl Copyright (C) 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -23,8 +23,8 @@ AC_DEFUN([gl_INTTYPES_H],
   dnl   - that imaxabs, imaxdiv, strtoimax, strtoumax are declared,
   dnl   - some additional tests.
   gl_cv_header_working_inttypes_h=no
-  if test $gl_cv_header_working_stdint_h = yes \
-     && test $gl_cv_header_inttypes_h = yes \
+  if test "$gl_cv_header_working_stdint_h" = yes \
+     && test "$gl_cv_header_inttypes_h" = yes \
      && test "$ac_cv_have_decl_imaxabs" = yes \
      && test "$ac_cv_have_decl_imaxdiv" = yes \
      && test "$ac_cv_have_decl_strtoimax" = yes \
Index: m4/lib-link.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/lib-link.m4,v
retrieving revision 1.6
diff -u -p -r1.6 lib-link.m4
--- m4/lib-link.m4      16 Aug 2006 18:12:09 -0000      1.6
+++ m4/lib-link.m4      18 Sep 2006 18:00:26 -0000
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 8 (gettext-0.15)
+# lib-link.m4 serial 9 (gettext-0.15.1)
 dnl Copyright (C) 2001-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,
@@ -198,9 +198,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f 
"$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; 
then
               found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
+              else
+                found_so="$additional_libdir/lib$name.dll.a"
+              fi
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -220,9 +227,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; 
then
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
                     found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
+                    else
+                      found_so="$dir/lib$name.dll.a"
+                    fi
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi
Index: m4/mktime.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/mktime.m4,v
retrieving revision 1.3
diff -u -p -r1.3 mktime.m4
--- m4/mktime.m4        4 Oct 2005 02:33:12 -0000       1.3
+++ m4/mktime.m4        18 Sep 2006 18:00:26 -0000
@@ -1,29 +1,29 @@
-#serial 7
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+#serial 8
+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Jim Meyering.
 
-# Redefine AC_FUNC_MKTIME, to fix a bug in Autoconf 2.57 and earlier.
-# This redefinition can be removed once a new version of Autoconf comes out.
+# Redefine AC_FUNC_MKTIME, to fix a bug in Autoconf 2.60a and earlier.
+# This redefinition can be removed once a new version of Autoconf is assumed.
 # The redefinition is taken from
-# 
<http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/autoconf/autoconf/lib/autoconf/functions.m4?rev=1.78>.
+# 
<http://cvs.sv.gnu.org/viewcvs/*checkout*/autoconf/lib/autoconf/functions.m4?rev=1.108&root=autoconf>.
 # AC_FUNC_MKTIME
 # --------------
 AC_DEFUN([AC_FUNC_MKTIME],
 [AC_REQUIRE([AC_HEADER_TIME])dnl
-AC_CHECK_HEADERS_ONCE(sys/time.h)
+AC_CHECK_HEADERS_ONCE(sys/time.h unistd.h)
 AC_CHECK_FUNCS_ONCE(alarm)
 AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime,
 [AC_RUN_IFELSE([AC_LANG_SOURCE(
 [[/* Test program from Paul Eggert and Tony Leneis.  */
-#if TIME_WITH_SYS_TIME
+#ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
 #else
-# if HAVE_SYS_TIME_H
+# ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
 # else
 #  include <time.h>
@@ -31,9 +31,12 @@ AC_CACHE_CHECK([for working mktime], ac_
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
 
-#if !HAVE_ALARM
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef HAVE_ALARM
 # define alarm(X) /* empty */
 #endif
 
@@ -50,9 +53,9 @@ static char *tz_strings[] = {
 };
 #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
 
-/* Fail if mktime fails to convert a date in the spring-forward gap.
+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
    Based on a problem report from Andreas Jaeger.  */
-static void
+static int
 spring_forward_gap ()
 {
   /* glibc (up to about 1998-10-07) failed this test. */
@@ -71,29 +74,27 @@ spring_forward_gap ()
   tm.tm_min = 0;
   tm.tm_sec = 0;
   tm.tm_isdst = -1;
-  if (mktime (&tm) == (time_t)-1)
-    exit (1);
+  return mktime (&tm) != (time_t) -1;
 }
 
-static void
+static int
 mktime_test1 (now)
      time_t now;
 {
   struct tm *lt;
-  if ((lt = localtime (&now)) && mktime (lt) != now)
-    exit (1);
+  return ! (lt = localtime (&now)) || mktime (lt) == now;
 }
 
-static void
+static int
 mktime_test (now)
      time_t now;
 {
-  mktime_test1 (now);
-  mktime_test1 ((time_t) (time_t_max - now));
-  mktime_test1 ((time_t) (time_t_min + now));
+  return (mktime_test1 (now)
+         && mktime_test1 ((time_t) (time_t_max - now))
+         && mktime_test1 ((time_t) (time_t_min + now)));
 }
 
-static void
+static int
 irix_6_4_bug ()
 {
   /* Based on code from Ariel Faigon.  */
@@ -106,11 +107,10 @@ irix_6_4_bug ()
   tm.tm_sec = 0;
   tm.tm_isdst = -1;
   mktime (&tm);
-  if (tm.tm_mon != 2 || tm.tm_mday != 31)
-    exit (1);
+  return tm.tm_mon == 2 && tm.tm_mday == 31;
 }
 
-static void
+static int
 bigtime_test (j)
      int j;
 {
@@ -132,8 +132,39 @@ bigtime_test (j)
             && lt->tm_wday == tm.tm_wday
             && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
                  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
-       exit (1);
+       return 0;
     }
+  return 1;
+}
+
+static int
+year_2050_test ()
+{
+  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
+     ignoring leap seconds.  */
+  unsigned long int answer = 2527315200UL;
+
+  struct tm tm;
+  time_t t;
+  tm.tm_year = 2050 - 1900;
+  tm.tm_mon = 2 - 1;
+  tm.tm_mday = 1;
+  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
+  tm.tm_isdst = -1;
+
+  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
+     instead of "TZ=America/Vancouver" in order to detect the bug even
+     on systems that don't support the Olson extension, or don't have the
+     full zoneinfo tables installed.  */
+  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+
+  t = mktime (&tm);
+
+  /* Check that the result is either a failure, or close enough
+     to the correct answer that we can assume the discrepancy is
+     due to leap seconds.  */
+  return (t == (time_t) -1
+         || (0 < t && answer - 120 <= t && t <= answer + 120));
 }
 
 int
@@ -160,18 +191,20 @@ main ()
        putenv (tz_strings[i]);
 
       for (t = 0; t <= time_t_max - delta; t += delta)
-       mktime_test (t);
-      mktime_test ((time_t) 1);
-      mktime_test ((time_t) (60 * 60));
-      mktime_test ((time_t) (60 * 60 * 24));
+       if (! mktime_test (t))
+         return 1;
+      if (! (mktime_test ((time_t) 1)
+            && mktime_test ((time_t) (60 * 60))
+            && mktime_test ((time_t) (60 * 60 * 24))))
+       return 1;
 
       for (j = 1; 0 < j; j *= 2)
-       bigtime_test (j);
-      bigtime_test (j - 1);
+       if (! bigtime_test (j))
+         return 1;
+      if (! bigtime_test (j - 1))
+       return 1;
     }
-  irix_6_4_bug ();
-  spring_forward_gap ();
-  exit (0);
+  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
 }]])],
               [ac_cv_func_working_mktime=yes],
               [ac_cv_func_working_mktime=no],
Index: m4/rename.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/rename.m4,v
retrieving revision 1.3
diff -u -p -r1.3 rename.m4
--- m4/rename.m4        25 Apr 2006 14:50:23 -0000      1.3
+++ m4/rename.m4        18 Sep 2006 18:00:26 -0000
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
 
 # Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -13,10 +13,10 @@ dnl If it doesn't, then define RENAME_TR
 dnl to compile the wrapper function.
 dnl
 
-AC_DEFUN([vb_FUNC_RENAME],
+AC_DEFUN([gl_FUNC_RENAME],
 [
  AC_CACHE_CHECK([whether rename is broken],
-  vb_cv_func_rename_trailing_slash_bug,
+  gl_cv_func_rename_trailing_slash_bug,
   [
     rm -rf conftest.d1 conftest.d2
     mkdir conftest.d1 ||
@@ -30,14 +30,14 @@ AC_DEFUN([vb_FUNC_RENAME],
           exit (rename ("conftest.d1/", "conftest.d2") ? 1 : 0);
         }
       ],
-      vb_cv_func_rename_trailing_slash_bug=no,
-      vb_cv_func_rename_trailing_slash_bug=yes,
+      gl_cv_func_rename_trailing_slash_bug=no,
+      gl_cv_func_rename_trailing_slash_bug=yes,
       dnl When crosscompiling, assume rename is broken.
-      vb_cv_func_rename_trailing_slash_bug=yes)
+      gl_cv_func_rename_trailing_slash_bug=yes)
 
       rm -rf conftest.d1 conftest.d2
   ])
-  if test $vb_cv_func_rename_trailing_slash_bug = yes; then
+  if test $gl_cv_func_rename_trailing_slash_bug = yes; then
     AC_LIBOBJ(rename)
     AC_DEFINE(rename, rpl_rename,
       [Define to rpl_rename if the replacement function should be used.])
Index: maint-aux/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/maint-aux/Makefile.in,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile.in
--- maint-aux/Makefile.in       2 Sep 2006 23:18:00 -0000       1.42
+++ maint-aux/Makefile.in       18 Sep 2006 18:00:26 -0000
@@ -215,6 +215,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: man/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/man/Makefile.in,v
retrieving revision 1.111
diff -u -p -r1.111 Makefile.in
--- man/Makefile.in     2 Sep 2006 23:18:00 -0000       1.111
+++ man/Makefile.in     18 Sep 2006 18:00:26 -0000
@@ -222,6 +222,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/Makefile.in,v
retrieving revision 1.183
diff -u -p -r1.183 Makefile.in
--- src/Makefile.in     2 Sep 2006 23:18:00 -0000       1.183
+++ src/Makefile.in     18 Sep 2006 18:00:26 -0000
@@ -259,6 +259,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: tools/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/tools/Makefile.in,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile.in
--- tools/Makefile.in   2 Sep 2006 23:18:00 -0000       1.101
+++ tools/Makefile.in   18 Sep 2006 18:00:26 -0000
@@ -218,6 +218,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: vms/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/Makefile.in,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile.in
--- vms/Makefile.in     2 Sep 2006 23:18:00 -0000       1.105
+++ vms/Makefile.in     18 Sep 2006 18:00:26 -0000
@@ -221,6 +221,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: windows-NT/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/Makefile.in,v
retrieving revision 1.135
diff -u -p -r1.135 Makefile.in
--- windows-NT/Makefile.in      2 Sep 2006 23:18:00 -0000       1.135
+++ windows-NT/Makefile.in      18 Sep 2006 18:00:26 -0000
@@ -231,6 +231,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@
Index: windows-NT/SCC/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/SCC/Makefile.in,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile.in
--- windows-NT/SCC/Makefile.in  2 Sep 2006 23:18:00 -0000       1.95
+++ windows-NT/SCC/Makefile.in  18 Sep 2006 18:00:28 -0000
@@ -219,6 +219,8 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTTYPES_H = @INTTYPES_H@
 KRB4 = @KRB4@
 LDFLAGS = @LDFLAGS@
+LIBCVS_LIBDEPS = @LIBCVS_LIBDEPS@
+LIBCVS_LTLIBDEPS = @LIBCVS_LTLIBDEPS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBMULTITHREAD = @LIBMULTITHREAD@




reply via email to

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