X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftimespec.m4;h=c281128c2b0aee212c5f8a4f86e30c177c27d80f;hb=16613e019fdfcd653604aa7ea704bb9641852b39;hp=4d547cf261e5b169bb840fd39ef0fe4eaaae0fa8;hpb=ee76465ad82c04707c78ff3ed723358217c9e34f;p=gnulib.git

diff --git a/m4/timespec.m4 b/m4/timespec.m4
index 4d547cf26..c281128c2 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,13 +1,38 @@
-#serial 5
+#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
 
+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_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([jm_CHECK_TYPE_STRUCT_TIMESPEC],
+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(
       [
@@ -28,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
 ])