From 6051a38028471b2c94c879c110c876ed25123ee2 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 18 Aug 2006 16:59:19 +0000 Subject: [PATCH] * gethrxtime.m4 (gl_PREREQ_GETHRXTIME): Also check for CLOCK_REALTIME, since gethrxtime may revert to using clock_gettime via gettime.c. --- m4/ChangeLog | 7 +++++++ m4/gethrxtime.m4 | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/m4/ChangeLog b/m4/ChangeLog index 4844152389..53b005fc54 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,10 @@ +2006-08-18 Jim Meyering + + * gethrxtime.m4 (gl_PREREQ_GETHRXTIME): Also check for CLOCK_REALTIME, + since gethrxtime may revert to using clock_gettime via gettime.c. + Gabor Z. Papp reported that gethrxtime-using programs failed to + link due to unresolved clock_gettime on a linux-2.4.x system. + 2006-08-17 Paul Eggert Update from coreutils. diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4 index 2b6fe367c4..663bd70a19 100644 --- a/m4/gethrxtime.m4 +++ b/m4/gethrxtime.m4 @@ -1,5 +1,5 @@ -# gethrxtime.m4 serial 3 -dnl Copyright (C) 2005 Free Software Foundation, Inc. +# gethrxtime.m4 serial 4 +dnl Copyright (C) 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. @@ -56,18 +56,18 @@ AC_DEFUN([gl_PREREQ_GETHRXTIME], if test $ac_cv_func_nanouptime != yes; then LIB_GETHRXTIME= - AC_CACHE_CHECK([whether CLOCK_MONOTONIC is defined], - gl_cv_have_CLOCK_MONOTONIC, - [AC_EGREP_CPP([have_CLOCK_MONOTONIC], + AC_CACHE_CHECK([whether CLOCK_MONOTONIC or CLOCK_REALTIME is defined], + gl_cv_have_clock_gettime_macro, + [AC_EGREP_CPP([have_clock_gettime_macro], [ # include -# ifdef CLOCK_MONOTONIC - have_CLOCK_MONOTONIC +# if defined CLOCK_MONOTONIC || defined CLOCK_REALTIME + have_clock_gettime_macro # endif ], - gl_cv_have_CLOCK_MONOTONIC=yes, - gl_cv_have_CLOCK_MONOTONIC=no)]) - if test $gl_cv_have_CLOCK_MONOTONIC = yes; then + gl_cv_have_clock_gettime_macro=yes, + gl_cv_have_clock_gettime_macro=no)]) + if test $gl_cv_have_clock_gettime_macro = yes; then LIB_GETHRXTIME=$LIB_CLOCK_GETTIME fi AC_SUBST([LIB_GETHRXTIME]) -- 2.30.2