* m4/rename-dest-slash.m4 (gl_FUNC_RENAME_TRAILING_DEST_SLASH):

[gnulib.git] / m4 / timespec.m4

diff --git a/m4/timespec.m4 b/m4/timespec.m4
index ad3e069..c281128 100644 (file)
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,15 +1,51 @@
-#serial 1
+#serial 12
+
+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 dnl From Jim Meyering
 
-dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared in time.h.
+AC_DEFUN([gl_TIMESPEC],
+[
+  dnl Prerequisites of lib/timespec.h.
+  AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([AC_HEADER_TIME])
+  AC_CHECK_HEADERS_ONCE(sys/time.h)
+  gl_CHECK_TYPE_STRUCT_TIMESPEC
+
+  dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
-AC_DEFUN(jm_CHECK_TYPE_STRUCT_TIMESPEC,
+  AC_CHECK_DECLS(nanosleep, , , [#include <time.h>])
+])
+
+dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared
+dnl in time.h or sys/time.h.
+
+AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
 [
+  dnl Persuade pedantic Solaris to declare struct timespec.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
+  AC_REQUIRE([AC_HEADER_TIME])
+  AC_CHECK_HEADERS_ONCE(sys/time.h)
   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,
@@ -17,7 +53,7 @@ AC_DEFUN(jm_CHECK_TYPE_STRUCT_TIMESPEC,
     ])
 
   if test $fu_cv_sys_struct_timespec = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_STRUCT_TIMESPEC, 1,
-                      [Define if struct timespec is declared in <time.h>. ])
+    AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1,
+             [Define if struct timespec is declared in <time.h>. ])
   fi
 ])