From 5af41bb205097206831f644ed648ee4f3221c6e3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 2 Mar 2006 07:36:41 +0000 Subject: [PATCH] * modules/gettime (Depends-on): Add extensions module. * modules/nanosleep (Depends-on): Likewise. * modules/settime (Depends-on): Likewise. * m4/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. * m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Likewise. * m4/timespec.m4 (gl_TIMESPEC): Likewise. --- ChangeLog | 6 ++++++ m4/ChangeLog | 6 ++++++ m4/clock_time.m4 | 8 ++++---- m4/nanosleep.m4 | 9 +++++++-- m4/timespec.m4 | 10 ++++++---- modules/gettime | 1 + modules/nanosleep | 1 + modules/settime | 1 + 8 files changed, 32 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 171f2fd8b..6546564a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-01 Paul Eggert + + * modules/gettime (Depends-on): Add extensions module. + * modules/nanosleep (Depends-on): Likewise. + * modules/settime (Depends-on): Likewise. + 2006-02-26 Paul Eggert * modules/intprops: New file. diff --git a/m4/ChangeLog b/m4/ChangeLog index 498111f34..a9ef1a801 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,5 +1,11 @@ 2006-03-01 Paul Eggert + * 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 to declare these functions. - AC_REQUIRE([AC_GNU_SOURCE]) + dnl Persuade glibc and Solaris 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 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 to declare nanosleep(). - AC_REQUIRE([AC_GNU_SOURCE]) + dnl Persuade glibc and Solaris to declare nanosleep. + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CHECK_DECLS(nanosleep, , , [#include ]) ]) diff --git a/modules/gettime b/modules/gettime index c16a71a61..bdaec914a 100644 --- a/modules/gettime +++ b/modules/gettime @@ -9,6 +9,7 @@ m4/gettime.m4 Depends-on: gettimeofday timespec +extensions configure.ac: gl_GETTIME diff --git a/modules/nanosleep b/modules/nanosleep index 51165f991..9d68e71f4 100644 --- a/modules/nanosleep +++ b/modules/nanosleep @@ -8,6 +8,7 @@ m4/nanosleep.m4 Depends-on: timespec stdbool +extensions configure.ac: gl_FUNC_NANOSLEEP diff --git a/modules/settime b/modules/settime index 71da479a3..3d0b58a3b 100644 --- a/modules/settime +++ b/modules/settime @@ -8,6 +8,7 @@ m4/settime.m4 Depends-on: timespec +extensions configure.ac: gl_SETTIME -- 2.11.0