X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsys_time_h.m4;h=13ac5763b3d5c76a26c6d5e5d0740f3b63f77cfb;hb=8eaac7a51d093dbcecc0c2b42a5762a882b4517b;hp=1943abf447621837713c05f5824c90538081e1f5;hpb=e376fca6b969fd70ca281a7b74b8c3d35636ea0f;p=gnulib.git

diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
index 1943abf44..13ac5763b 100644
--- a/m4/sys_time_h.m4
+++ b/m4/sys_time_h.m4
@@ -9,18 +9,22 @@
 
 AC_DEFUN([gl_HEADER_SYS_TIME_H],
 [
+  dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement
+  dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1
+  dnl statements that occur in other macros.
+  AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY])
+])
+
+AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY],
+[
   AC_REQUIRE([AC_C_RESTRICT])
-  AC_CHECK_HEADERS_ONCE([sys/time.h])
+  gl_CHECK_NEXT_HEADERS([sys/time.h])
 
   if test $ac_cv_header_sys_time_h = yes; then
-    gl_ABSOLUTE_HEADER([sys/time.h])
-    ABSOLUTE_SYS_TIME_H=\"$gl_cv_absolute_sys_time_h\"
     HAVE_SYS_TIME_H=1
   else
-    ABSOLUTE_SYS_TIME_H=\"no/such/file/sys/time.h\"
     HAVE_SYS_TIME_H=0
   fi
-  AC_SUBST([ABSOLUTE_SYS_TIME_H])
   AC_SUBST([HAVE_SYS_TIME_H])
 
   AC_CACHE_CHECK([for struct timeval], [gl_cv_sys_struct_timeval],
@@ -42,6 +46,12 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H],
   AC_SUBST([HAVE_STRUCT_TIMEVAL])
 
   dnl Assume POSIX behavior unless another module says otherwise.
-  GETTIMEOFDAY_REPLACEMENT=0
-  AC_SUBST([GETTIMEOFDAY_REPLACEMENT])
+  REPLACE_GETTIMEOFDAY=0
+  AC_SUBST([REPLACE_GETTIMEOFDAY])
+  if test $HAVE_SYS_TIME_H = 0 || test $HAVE_STRUCT_TIMEVAL = 0; then
+    SYS_TIME_H=sys/time.h
+  else
+    SYS_TIME_H=
+  fi
+  AC_SUBST([SYS_TIME_H])
 ])