* gethrxtime.m4 (gl_PREREQ_GETHRXTIME): Also check for CLOCK_REALTIME,

since gethrxtime may revert to using clock_gettime via gettime.c.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 48441523892abdaf1535702122aca7ffb4484d72..53b005fc5452c83f18ce66ad54b566db40f3eb50 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-18  Jim Meyering  <jim@meyering.net>
+
+       * 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  <eggert@cs.ucla.edu>
 
        Update from coreutils.

diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4
index 2b6fe367c445b0a4acbb31f7ce239a7b7dd68b1f..663bd70a19bc138dd520308bd6ee1f811e4ce8b8 100644 (file)
--- 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 <time.h>
-#        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])