X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftimespec.m4;h=4d547cf261e5b169bb840fd39ef0fe4eaaae0fa8;hb=02e3bf2a532498c860f248a9bd81869dbf514404;hp=ad3e069f954f98377a74ecf126b1e30fa3315216;hpb=7ac215b644df7c2f0145b0b093c5e3298746bc85;p=gnulib.git

diff --git a/m4/timespec.m4 b/m4/timespec.m4
index ad3e069f9..4d547cf26 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,15 +1,26 @@
-#serial 1
+#serial 5
 
 dnl From Jim Meyering
 
-dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared in time.h.
+dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared
+dnl in time.h or sys/time.h.
 
-AC_DEFUN(jm_CHECK_TYPE_STRUCT_TIMESPEC,
+AC_DEFUN([jm_CHECK_TYPE_STRUCT_TIMESPEC],
 [
+  AC_REQUIRE([AC_HEADER_TIME])
   AC_CACHE_CHECK([for struct timespec], fu_cv_sys_struct_timespec,
     [AC_TRY_COMPILE(
       [
-#include <time.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
       ],
       [static struct timespec x; x.tv_sec = x.tv_nsec;],
       fu_cv_sys_struct_timespec=yes,