X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftimespec.m4;h=a500a3e7118554c29d7650d2ee2d791d0008bfd0;hb=d8c878368309fa0255b79d90bc773e63e8260053;hp=c80ca3213b3cce5a44afa648cedc190158125fb9;hpb=0b9f1bb6cc0298a13fc03f25068f123ad1a93d08;p=gnulib.git

diff --git a/m4/timespec.m4 b/m4/timespec.m4
index c80ca3213..a500a3e71 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,14 +1,41 @@
-#serial 3
+#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],
+[
+  AC_LIBSOURCES([timespec.h])
+
+  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_REQUIRE([AC_HEADER_TIME])
     [AC_TRY_COMPILE(
       [
 #      if TIME_WITH_SYS_TIME
@@ -28,7 +55,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
 ])