X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ftimespec.m4;h=c281128c2b0aee212c5f8a4f86e30c177c27d80f;hb=805c9bc71456ba51288ec822e3dedbe3320ef3ea;hp=5ca16d48dc5e7c4a63b1370cc9c11f8bbede7ed5;hpb=6544b9e91b88b9e4d0ee5a061515e4e6a756e2cf;p=gnulib.git

diff --git a/m4/timespec.m4 b/m4/timespec.m4
index 5ca16d48d..c281128c2 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,17 +1,24 @@
-#serial 7
+#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)
-  jm_CHECK_TYPE_STRUCT_TIMESPEC
-  AC_STRUCT_ST_MTIM_NSEC
+  gl_CHECK_TYPE_STRUCT_TIMESPEC
 
-  dnl Persuade glibc <time.h> to declare nanosleep().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
   AC_CHECK_DECLS(nanosleep, , , [#include <time.h>])
 ])
@@ -19,7 +26,7 @@ AC_DEFUN([gl_TIMESPEC],
 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])