X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgethrxtime.m4;h=76979c1c339e4711235f26e54930541bd86fd0ba;hb=395f9e6a19b504609aa8b0bd7f8cc55d4547d8dd;hp=ef5e61079728f24dfd91365a15b5d359d5da6935;hpb=d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0;p=gnulib.git

diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4
index ef5e61079..76979c1c3 100644
--- a/m4/gethrxtime.m4
+++ b/m4/gethrxtime.m4
@@ -1,4 +1,4 @@
-# gethrxtime.m4 serial 9
+# gethrxtime.m4 serial 10
 dnl Copyright (C) 2005-2006, 2008-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,12 +13,29 @@ AC_DEFUN([gl_GETHRXTIME],
   AC_REQUIRE([gl_XTIME])
   AC_CHECK_DECLS([gethrtime], [], [], [#include <time.h>])
   LIB_GETHRXTIME=
-  case $ac_cv_have_decl_gethrtime,$gl_cv_arithmetic_hrtime_t in
-  yes,yes) ;;
-  *)
-    AC_LIBOBJ([gethrxtime])
-    gl_PREREQ_GETHRXTIME;;
-  esac
+  if test $ac_cv_have_decl_gethrtime = no \
+     || test $gl_cv_arithmetic_hrtime_t = no; then
+    dnl Find libraries needed to link lib/gethrxtime.c.
+    AC_REQUIRE([gl_CLOCK_TIME])
+    AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+    AC_CHECK_FUNCS_ONCE([nanouptime])
+    if test $ac_cv_func_nanouptime != yes; then
+      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>
+#          if defined CLOCK_MONOTONIC || defined CLOCK_REALTIME
+            have_clock_gettime_macro
+#          endif
+          ],
+          [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
+    fi
+  fi
   AC_SUBST([LIB_GETHRXTIME])
 ])
 
@@ -51,24 +68,6 @@ AC_DEFUN([gl_XTIME],
 # Prerequisites of lib/gethrxtime.c.
 AC_DEFUN([gl_PREREQ_GETHRXTIME],
 [
-  AC_REQUIRE([gl_CLOCK_TIME])
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_CHECK_FUNCS_ONCE([microuptime nanouptime])
-
-  if test $ac_cv_func_nanouptime != yes; then
-    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>
-#        if defined CLOCK_MONOTONIC || defined CLOCK_REALTIME
-          have_clock_gettime_macro
-#        endif
-        ],
-        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
-  fi
+  AC_CHECK_FUNCS_ONCE([microuptime])
+  :
 ])