X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgethrxtime.m4;h=942500342e3a26fd419fc26f276bd8f249c1312b;hb=820ad111e4c5b7877f18f29246059c86ee70351d;hp=d33ecacbe0851ecbe88ba357fdbfa1c77a64cd34;hpb=42d1eda5dcce2d68deab7a642e7f29bcd7144a0d;p=gnulib.git diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4 index d33ecacbe..942500342 100644 --- a/m4/gethrxtime.m4 +++ b/m4/gethrxtime.m4 @@ -1,5 +1,5 @@ -# gethrxtime.m4 serial 8 -dnl Copyright (C) 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# gethrxtime.m4 serial 9 +dnl Copyright (C) 2005, 2006, 2008, 2009, 2010 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. @@ -12,12 +12,14 @@ AC_DEFUN([gl_GETHRXTIME], AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_XTIME]) AC_CHECK_DECLS([gethrtime], [], [], [#include ]) + LIB_GETHRXTIME= case $ac_cv_have_decl_gethrtime,$gl_cv_arithmetic_hrtime_t in yes,yes) ;; *) AC_LIBOBJ([gethrxtime]) gl_PREREQ_GETHRXTIME;; esac + AC_SUBST([LIB_GETHRXTIME]) ]) # Test whether hrtime_t is an arithmetic type. @@ -29,7 +31,7 @@ AC_DEFUN([gl_ARITHMETIC_HRTIME_T], AC_CACHE_CHECK([for arithmetic hrtime_t], [gl_cv_arithmetic_hrtime_t], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include ]], - [[hrtime_t x = 0; return x/x;]])], + [[hrtime_t x = 0; return x/x;]])], [gl_cv_arithmetic_hrtime_t=yes], [gl_cv_arithmetic_hrtime_t=no])]) if test $gl_cv_arithmetic_hrtime_t = yes; then @@ -54,21 +56,19 @@ AC_DEFUN([gl_PREREQ_GETHRXTIME], AC_CHECK_FUNCS_ONCE([microuptime nanouptime]) if test $ac_cv_func_nanouptime != yes; then - LIB_GETHRXTIME= 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 # if defined CLOCK_MONOTONIC || defined CLOCK_REALTIME - have_clock_gettime_macro + have_clock_gettime_macro # endif - ], - gl_cv_have_clock_gettime_macro=yes, - gl_cv_have_clock_gettime_macro=no)]) + ], + 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]) fi ])