diff options
Diffstat (limited to 'gnulib-local/m4')
-rw-r--r-- | gnulib-local/m4/clock_time.m4.diff | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gnulib-local/m4/clock_time.m4.diff b/gnulib-local/m4/clock_time.m4.diff index c144d51c2..efcd5f4d6 100644 --- a/gnulib-local/m4/clock_time.m4.diff +++ b/gnulib-local/m4/clock_time.m4.diff @@ -4,25 +4,26 @@ See <http://lists.gnu.org/archive/html/bug-gnulib/2011-06/msg00227.html> for details. diff --git a/m4/clock_time.m4 b/m4/clock_time.m4 -index 225355331..61373c4b7 100644 +index d624a73d35..7b2f5bf1ab 100644 --- a/m4/clock_time.m4 +++ b/m4/clock_time.m4 -@@ -25,8 +25,17 @@ AC_DEFUN([gl_CLOCK_TIME], - AC_SUBST([LIB_CLOCK_GETTIME]) +@@ -25,9 +25,18 @@ AC_DEFUN([gl_CLOCK_TIME], + AC_SUBST([CLOCK_TIME_LIB]) gl_saved_libs=$LIBS AC_SEARCH_LIBS([clock_gettime], [rt posix4], + [if test "$ac_cv_search_clock_gettime" = "none required"; then + AC_SEARCH_LIBS([clock_getcpuclockid], [rt posix4], + [test "$ac_cv_search_clock_getcpuclockid" = "none required" \ -+ || LIB_CLOCK_GETTIME=$ac_cv_search_clock_getcpuclockid], ++ || CLOCK_TIME_LIB=$ac_cv_search_clock_getcpuclockid], + [test "$ac_cv_search_clock_gettime" = "none required" \ -+ || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) ++ || CLOCK_TIME_LIB=$ac_cv_search_clock_gettime]) + else -+ LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime -+ fi]) ++ CLOCK_TIME_LIB=$ac_cv_search_clock_gettime ++ fi] [test "$ac_cv_search_clock_gettime" = "none required" || - LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) + CLOCK_TIME_LIB=$ac_cv_search_clock_gettime]) - AC_CHECK_FUNCS([clock_getres clock_gettime clock_settime]) + AC_CHECK_FUNCS([clock_getres clock_gettime clock_settime clock_getcpuclockid]) LIBS=$gl_saved_libs - ]) + # For backward compatibility. + LIB_CLOCK_GETTIME="$CLOCK_TIME_LIB" |