[Cvs-cvs] ccvs ./ChangeLog ./configure lib/ChangeLog lib/...

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/05/22 23:58:59

Modified files:
        .              : ChangeLog configure 
        lib            : ChangeLog nanosleep.c 
        m4             : ChangeLog nanosleep.m4 

Log message:
        * configure: Regenerated.
        
        * lib/nanosleep.c: Update from gnulib.
        
        * m4/nanosleep.m4: Update from gnulib.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1305&tr2=1.1306&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.diff?tr1=1.450&tr2=1.451&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/ChangeLog.diff?tr1=1.508&tr2=1.509&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/lib/nanosleep.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/ChangeLog.diff?tr1=1.168&tr2=1.169&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/nanosleep.m4.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1305 ccvs/ChangeLog:1.1306
--- ccvs/ChangeLog:1.1305       Fri May 19 17:11:19 2006
+++ ccvs/ChangeLog      Mon May 22 23:58:59 2006
@@ -1,3 +1,7 @@
+2006-05-22  Mark D. Baushke  <address@hidden>
+
+       * configure: Regenerated.
+
 2006-05-19  Mark D. Baushke  <address@hidden>
 
        * build-aux/config.rpath: Update via gnulib-update.
Index: ccvs/configure
diff -u ccvs/configure:1.450 ccvs/configure:1.451
--- ccvs/configure:1.450        Tue May 16 01:28:16 2006
+++ ccvs/configure      Mon May 22 23:58:59 2006
@@ -1493,6 +1493,7 @@
 gl_func_list="$gl_func_list mbsinit"
 gl_func_list="$gl_func_list alarm"
 gl_func_list="$gl_func_list siginterrupt"
+gl_header_list="$gl_header_list sys/select.h"
 gl_func_list="$gl_func_list posix_memalign"
 gl_func_list="$gl_func_list iswprint"
 gl_header_list="$gl_header_list locale.h"
@@ -14852,6 +14853,12 @@
 
 
 
+
+
+
+
+
+
   # Check for mmap()
 
 
@@ -24388,6 +24395,17 @@
 
 
 
+
+
+
+
+  :
+
+
+
+
+
+
  nanosleep_save_libs=$LIBS
 
  # Solaris 2.5.1 needs -lposix4 to get the nanosleep function.
@@ -24521,26 +24539,13 @@
 
 
 
- echo "$as_me:$LINENO: checking whether nanosleep works" >&5
-echo $ECHO_N "checking whether nanosleep works... $ECHO_C" >&6
-if test "${jm_cv_func_nanosleep_works+set}" = set; then
+ echo "$as_me:$LINENO: checking for nanosleep" >&5
+echo $ECHO_N "checking for nanosleep... $ECHO_C" >&6
+if test "${gl_cv_func_nanosleep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-
-
-
-
-  :
-
-
-
-
-
-   if test "$cross_compiling" = yes; then
-        jm_cv_func_nanosleep_works=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -24564,37 +24569,46 @@
       struct timespec ts_sleep, ts_remaining;
       ts_sleep.tv_sec = 0;
       ts_sleep.tv_nsec = 1;
-      return nanosleep (&ts_sleep, &ts_remaining) != 0;
+      return nanosleep (&ts_sleep, &ts_remaining) < 0;
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
+rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  jm_cv_func_nanosleep_works=yes
+  gl_cv_func_nanosleep=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-jm_cv_func_nanosleep_works=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 
conftest.$ac_ext
+gl_cv_func_nanosleep=no
 fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $jm_cv_func_nanosleep_works" >&5
-echo "${ECHO_T}$jm_cv_func_nanosleep_works" >&6
-  if test $jm_cv_func_nanosleep_works = no; then
+echo "$as_me:$LINENO: result: $gl_cv_func_nanosleep" >&5
+echo "${ECHO_T}$gl_cv_func_nanosleep" >&6
+  if test $gl_cv_func_nanosleep = no; then
     case $LIBOBJS in
     "nanosleep.$ac_objext"   | \
   *" nanosleep.$ac_objext"   | \
@@ -24617,6 +24631,13 @@
 
 
 
+  :
+
+
+
+
+
+
   fi
 
  LIBS=$nanosleep_save_libs
Index: ccvs/lib/ChangeLog
diff -u ccvs/lib/ChangeLog:1.508 ccvs/lib/ChangeLog:1.509
--- ccvs/lib/ChangeLog:1.508    Fri May 19 17:11:20 2006
+++ ccvs/lib/ChangeLog  Mon May 22 23:58:59 2006
@@ -1,4 +1,8 @@
-2006-05-19  Mark D. Baushke  <address@hidden>
+2006-05-22  Mark D. Baushke  <address@hidden>
+
+       * nanosleep.c: Update from gnulib.
+
+2006-05-19  Mark D. Baushke  <address@hidden>
 
        * stdint_.h: Update from gnulib.
 
Index: ccvs/lib/nanosleep.c
diff -u ccvs/lib/nanosleep.c:1.7 ccvs/lib/nanosleep.c:1.8
--- ccvs/lib/nanosleep.c:1.7    Tue Oct  4 02:34:54 2005
+++ ccvs/lib/nanosleep.c        Mon May 22 23:58:59 2006
@@ -1,5 +1,7 @@
 /* Provide a replacement for the POSIX nanosleep function.
-   Copyright (C) 1999, 2000, 2002, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 1999, 2000, 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
@@ -27,9 +29,23 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#if HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
 #include <sys/types.h>
 #include <signal.h>
 
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <errno.h>
 
 #include <unistd.h>
@@ -57,7 +73,7 @@
   suspended = 1;
 }
 
-/* FIXME: comment */
+/* Suspend execution for at least *TS_DELAY seconds.  */
 
 static void
 my_usleep (const struct timespec *ts_delay)
@@ -67,13 +83,20 @@
   tv_delay.tv_usec = (ts_delay->tv_nsec + 999) / 1000;
   if (tv_delay.tv_usec == 1000000)
     {
-      tv_delay.tv_sec++;
-      tv_delay.tv_usec = 0;
+      time_t t1 = tv_delay.tv_sec + 1;
+      if (t1 < tv_delay.tv_sec)
+       tv_delay.tv_usec = 1000000 - 1; /* close enough */
+      else
+       {
+         tv_delay.tv_sec = t1;
+         tv_delay.tv_usec = 0;
+       }
     }
   select (0, NULL, NULL, NULL, &tv_delay);
 }
 
-/* FIXME: comment */
+/* Suspend execution for at least *REQUESTED_DELAY seconds.  The
+   *REMAINING_DELAY part isn't implemented yet.  */
 
 int
 rpl_nanosleep (const struct timespec *requested_delay,
Index: ccvs/m4/ChangeLog
diff -u ccvs/m4/ChangeLog:1.168 ccvs/m4/ChangeLog:1.169
--- ccvs/m4/ChangeLog:1.168     Mon May 15 23:10:59 2006
+++ ccvs/m4/ChangeLog   Mon May 22 23:58:59 2006
@@ -1,3 +1,7 @@
+2006-05-22  Mark D. Baushke  <address@hidden>
+
+       * nanosleep.m4: Update from gnulib.
+
 2006-05-15  Mark D. Baushke  <address@hidden>
 
        * stdbool.m4: Update from gnulib.
Index: ccvs/m4/nanosleep.m4
diff -u ccvs/m4/nanosleep.m4:1.7 ccvs/m4/nanosleep.m4:1.8
--- ccvs/m4/nanosleep.m4:1.7    Tue Apr 25 14:50:23 2006
+++ ccvs/m4/nanosleep.m4        Mon May 22 23:58:59 2006
@@ -1,4 +1,4 @@
-#serial 16
+#serial 17
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
@@ -16,6 +16,12 @@
 [
  AC_LIBSOURCES([nanosleep.c])
 
+ dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
+ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
+ AC_REQUIRE([AC_HEADER_TIME])
+ AC_CHECK_HEADERS_ONCE(sys/time.h)
+
  nanosleep_save_libs=$LIBS
 
  # Solaris 2.5.1 needs -lposix4 to get the nanosleep function.
@@ -25,15 +31,10 @@
                 LIB_NANOSLEEP=$ac_cv_search_nanosleep])
  AC_SUBST([LIB_NANOSLEEP])
 
- AC_CACHE_CHECK([whether nanosleep works],
-  jm_cv_func_nanosleep_works,
+ AC_CACHE_CHECK([for nanosleep],
+  [gl_cv_func_nanosleep],
   [
-   dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
-   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-
-   AC_REQUIRE([AC_HEADER_TIME])
-   AC_CHECK_HEADERS_ONCE(sys/time.h)
-   AC_TRY_RUN([
+   AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #   if TIME_WITH_SYS_TIME
 #    include <sys/time.h>
 #    include <time.h>
@@ -51,15 +52,13 @@
       struct timespec ts_sleep, ts_remaining;
       ts_sleep.tv_sec = 0;
       ts_sleep.tv_nsec = 1;
-      return nanosleep (&ts_sleep, &ts_remaining) != 0;
+      return nanosleep (&ts_sleep, &ts_remaining) < 0;
     }
-         ],
-        jm_cv_func_nanosleep_works=yes,
-        jm_cv_func_nanosleep_works=no,
-        dnl When crosscompiling, assume the worst.
-        jm_cv_func_nanosleep_works=no)
+      ]])],
+     [gl_cv_func_nanosleep=yes],
+     [gl_cv_func_nanosleep=no])
   ])
-  if test $jm_cv_func_nanosleep_works = no; then
+  if test $gl_cv_func_nanosleep = no; then
     AC_LIBOBJ(nanosleep)
     AC_DEFINE(nanosleep, rpl_nanosleep,
       [Define to rpl_nanosleep if the replacement function should be used.])
@@ -73,4 +72,5 @@
 AC_DEFUN([gl_PREREQ_NANOSLEEP],
 [
   AC_CHECK_FUNCS_ONCE(siginterrupt)
+  AC_CHECK_HEADERS_ONCE(sys/select.h)
 ])