[Cvs-cvs] ccvs ./ChangeLog ./configure m4/error.m4 m4/tim... [signed-commits4]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         signed-commits4
Changes by:     Derek Robert Price <address@hidden>     06/04/12 17:53:59

Modified files:
        .              : ChangeLog configure 
        m4             : error.m4 time_r.m4 

Log message:
        * m4/error.m4, m4/time_r.m4: Update from GNULIB.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?only_with_tag=signed-commits4&tr1=1.1285.2.1&tr2=1.1285.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.diff?only_with_tag=signed-commits4&tr1=1.438.2.1&tr2=1.438.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/error.m4.diff?only_with_tag=signed-commits4&tr1=1.1.12.1&tr2=1.1.12.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/m4/time_r.m4.diff?only_with_tag=signed-commits4&tr1=1.2&tr2=1.2.12.1&r1=text&r2=text

Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1285.2.1 ccvs/ChangeLog:1.1285.2.2
--- ccvs/ChangeLog:1.1285.2.1   Wed Apr 12 02:36:56 2006
+++ ccvs/ChangeLog      Wed Apr 12 17:53:58 2006
@@ -1,3 +1,7 @@
+2006-04-12  Derek Price  <address@hidden>
+
+       * m4/error.m4, m4/time_r.m4: Update from GNULIB.
+
 2006-01-20  Derek Price  <address@hidden>
 
        * GPG-TODO: Note progress.
Index: ccvs/configure
diff -u ccvs/configure:1.438.2.1 ccvs/configure:1.438.2.2
--- ccvs/configure:1.438.2.1    Wed Apr 12 02:36:57 2006
+++ ccvs/configure      Wed Apr 12 17:53:58 2006
@@ -18225,71 +18225,6 @@
 
 
 
-  echo "$as_me:$LINENO: checking for error_at_line" >&5
-echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6
-if test "${ac_cv_lib_error_at_line+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-error_at_line (0, 0, "", 0, "");
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"
-                        || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-        { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_error_at_line=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_error_at_line=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_error_at_line" >&5
-echo "${ECHO_T}$ac_cv_lib_error_at_line" >&6
-if test $ac_cv_lib_error_at_line = no; then
-  case $LIBOBJS in
-    "error.$ac_objext"   | \
-  *" error.$ac_objext"   | \
-    "error.$ac_objext "* | \
-  *" error.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS error.$ac_objext" ;;
-esac
-
-fi
-
 
 
   :
@@ -29928,6 +29863,7 @@
 
 
 
+
   echo "$as_me:$LINENO: checking whether localtime_r is compatible with its 
POSIX signature" >&5
 echo $ECHO_N "checking whether localtime_r is compatible with its POSIX 
signature... $ECHO_C" >&6
 if test "${gl_cv_time_r_posix+set}" = set; then
Index: ccvs/m4/error.m4
diff -u ccvs/m4/error.m4:1.1.12.1 ccvs/m4/error.m4:1.1.12.2
--- ccvs/m4/error.m4:1.1.12.1   Wed Apr 12 02:36:58 2006
+++ ccvs/m4/error.m4    Wed Apr 12 17:53:59 2006
@@ -9,8 +9,6 @@
 
 AC_DEFUN([gl_ERROR],
 [
-  AC_FUNC_ERROR_AT_LINE
-  dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
   gl_PREREQ_ERROR
 ])
 
Index: ccvs/m4/time_r.m4
diff -u /dev/null ccvs/m4/time_r.m4:1.2.12.1
--- /dev/null   Wed Apr 12 17:53:59 2006
+++ ccvs/m4/time_r.m4   Wed Apr 12 17:53:59 2006
@@ -0,0 +1,39 @@
+dnl Reentrant time functions like localtime_r.
+
+dnl Copyright (C) 2003, 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 Written by Paul Eggert.
+
+AC_DEFUN([gl_TIME_R],
+[
+  AC_LIBSOURCES([time_r.c, time_r.h])
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_REQUIRE([gl_C_RESTRICT])
+
+  AC_CACHE_CHECK([whether localtime_r is compatible with its POSIX signature],
+    [gl_cv_time_r_posix],
+    [AC_TRY_COMPILE(
+       [#include <time.h>],
+       [/* We don't need to append 'restrict's to the argument types,
+          even though the POSIX signature has the 'restrict's,
+          since C99 says they can't affect type compatibility.  */
+       struct tm * (*ptr) (time_t const *, struct tm *) = localtime_r;],
+       [gl_cv_time_r_posix=yes],
+       [gl_cv_time_r_posix=no])])
+  if test $gl_cv_time_r_posix = yes; then
+    AC_DEFINE([HAVE_TIME_R_POSIX], 1,
+      [Define to 1 if localtime_r, etc. have the type signatures that
+       POSIX requires.])
+  else
+    AC_LIBOBJ([time_r])
+    gl_PREREQ_TIME_R
+  fi
+])
+
+# Prerequisites of lib/time_r.c.
+AC_DEFUN([gl_PREREQ_TIME_R], [
+  :
+])