gettimeofday: restore support for platforms that lack function

Fixes a regression from 2010-02-04, commit de4d0a3.

* m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY): Also compile
replacement if function is missing.
* m4/sys_time_h.m4 (gl_HEADER_SYS_TIME_H_DEFAULTS): New witness.
* modules/sys_time (Makefile.am): Substitute it.
* lib/sys_time.in.h (gettimeofday): Check it.
Reported by Michael Goffioul.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 6a04f8bf1a6f2872a325de10e2269656a9d4d62b..efba1e7f4b8b36f0c588ac40ceed8e421f68cfc8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-22  Eric Blake  <eblake@redhat.com>
+
+       gettimeofday: restore support for platforms that lack function
+       * m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY): Also compile
+       replacement if function is missing.
+       * m4/sys_time_h.m4 (gl_HEADER_SYS_TIME_H_DEFAULTS): New witness.
+       * modules/sys_time (Makefile.am): Substitute it.
+       * lib/sys_time.in.h (gettimeofday): Check it.
+       Reported by Michael Goffioul.
+
 2010-02-21  Bruno Haible  <bruno@clisp.org>
 
        * lib/stdio.in.h (obstack_printf): Fix typo.

diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h
index 12f0860be6a043c42718669fcd7b5f692950bdb0..fe7f62435d794076ea53a494131b85497373acc9 100644 (file)
--- a/lib/sys_time.in.h
+++ b/lib/sys_time.in.h
@@ -59,6 +59,8 @@ struct timeval
 #  if @REPLACE_GETTIMEOFDAY@
 #   undef gettimeofday
 #   define gettimeofday rpl_gettimeofday
+#  endif
+#  if @REPLACE_GETTIMEOFDAY@ || !@HAVE_GETTIMEOFDAY@
 extern int gettimeofday (struct timeval *restrict, void *restrict)
      _GL_ARG_NONNULL ((1));
 #  endif

diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index 32e4f29a9f5a16c2626c11107880f24d998f869f..709a4d4fb4723c132082ced5fdbc454945985743 100644 (file)
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -1,4 +1,4 @@
-# serial 14
+# serial 15
 
 # Copyright (C) 2001-2003, 2005, 2007, 2009-2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -15,7 +15,11 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY],
   AC_CHECK_FUNCS_ONCE([gettimeofday])
 
   gl_gettimeofday_timezone=void
-  if test $ac_cv_func_gettimeofday = yes; then
+  if test $ac_cv_func_gettimeofday != yes; then
+    HAVE_GETTIMEOFDAY=0
+    AC_LIBOBJ([gettimeofday])
+    gl_PREREQ_GETTIMEOFDAY
+  else
     gl_FUNC_GETTIMEOFDAY_CLOBBER
     AC_CACHE_CHECK([for gettimeofday with POSIX signature],
       [gl_cv_func_gettimeofday_posix_signature],

diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
index b14bc4ba2bc0bb2c805df287efca40bd05929026..be6d7ecbfa49dc6b986de3091d25cf2cf78f7bfb 100644 (file)
--- a/m4/sys_time_h.m4
+++ b/m4/sys_time_h.m4
@@ -1,5 +1,5 @@
 # Configure a replacement for <sys/time.h>.
-# serial 3
+# serial 4
 
 # Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -63,6 +63,7 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS],
 [
   GNULIB_GETTIMEOFDAY=0;     AC_SUBST([GNULIB_GETTIMEOFDAY])
   dnl Assume POSIX behavior unless another module says otherwise.
+  HAVE_GETTIMEOFDAY=1;       AC_SUBST([HAVE_GETTIMEOFDAY])
   HAVE_STRUCT_TIMEVAL=1;     AC_SUBST([HAVE_STRUCT_TIMEVAL])
   HAVE_SYS_TIME_H=1;         AC_SUBST([HAVE_SYS_TIME_H])
   REPLACE_GETTIMEOFDAY=0;    AC_SUBST([REPLACE_GETTIMEOFDAY])

diff --git a/modules/sys_time b/modules/sys_time
index 28d902eb9e496bb7958a5e8e0b340b3ee2387fd8..adfa49386ac6a8475e3f76fafa9362567bb17596 100644 (file)
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -28,6 +28,7 @@ sys/time.h: sys_time.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
              -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
+             -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
              -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
              -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \