Require gl_USE_SYSTEM_EXTENSIONS, not merely AC_GNU_SOURCE, for the

benefit of Solaris 10 when compiled pedantically.

4 files changed, 23 insertions, 10 deletions

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 98c0024c0..3e063f8c4 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,11 @@
 2006-03-01  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* clock_time.m4 (gl_CLOCK_TIME): Require gl_USE_SYSTEM_EXTENSIONS,
+	not merely AC_GNU_SOURCE, for the benefit of Solaris 10 when compiled
+	pedantically.
+	* nanosleep.m4 (gl_FUNC_NANOSLEEP): Likewise.
+	* timespec.m4 (gl_TIMESPEC): Likewise.
+
 	* extensions.m4 (gl_USE_SYSTEM_EXTENSIONS): Use "=" with "test",
 	not "==".  Reported by Ralf Wildenhues.
 
diff --git a/m4/clock_time.m4 b/m4/clock_time.m4
index 0cedfe41b..63196ae27 100644
--- a/m4/clock_time.m4
+++ b/m4/clock_time.m4
@@ -1,5 +1,5 @@
-# clock_time.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# clock_time.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,8 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
 # Check for clock_gettime and clock_settime, and sets LIB_CLOCK_GETTIME.
 AC_DEFUN([gl_CLOCK_TIME],
 [
-  # dnl Persuade glibc <time.h> to declare these functions.
-  AC_REQUIRE([AC_GNU_SOURCE])
+  dnl Persuade glibc and Solaris <time.h> to declare these functions.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
   # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function.
   # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 2d6c90b47..859b4f70b 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,11 +1,13 @@
-#serial 14
+#serial 15
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
 dnl If not found, use the supplied replacement.
 dnl
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 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.
@@ -26,6 +28,9 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
  AC_CACHE_CHECK([whether nanosleep works],
   jm_cv_func_nanosleep_works,
   [
+   dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
+   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
    AC_REQUIRE([AC_HEADER_TIME])
    AC_CHECK_HEADERS_ONCE(sys/time.h)
    AC_TRY_RUN([
diff --git a/m4/timespec.m4 b/m4/timespec.m4
index fddf4b642..a500a3e71 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,6 +1,8 @@
-#serial 11
+#serial 12
+
+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
 
-# Copyright (C) 2000, 2001, 2003, 2004, 2005 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.
@@ -17,8 +19,8 @@ AC_DEFUN([gl_TIMESPEC],
   AC_CHECK_HEADERS_ONCE(sys/time.h)
   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>])
 ])