Require AC_HEADER_TIME, and include sys/time.h as well

as time.h in the compile check.

diff --git a/m4/timespec.m4 b/m4/timespec.m4
index ad3e069..c80ca32 100644 (file)
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,15 +1,26 @@
-#serial 1
+#serial 3
 
 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_CACHE_CHECK([for struct timespec], fu_cv_sys_struct_timespec,
+   AC_REQUIRE([AC_HEADER_TIME])
     [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,