From a35ee9f402c87287f3a1c04eb5824ea72f7ae7bc Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 17 Jun 2016 15:04:17 +0200 Subject: [PATCH] Revert "configure: Cache result of pthread_condattr_setclock() check" This reverts commit 8d79bfa8318ddd1b9b863241fe0e637be73af5f4 as it does not provide any advantage over setting ac_cv_func_pthread_condattr_setclock=no. References #1502. --- configure.ac | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index 35f069a7a..3c6132e5f 100644 --- a/configure.ac +++ b/configure.ac @@ -512,28 +512,24 @@ AC_COMPILE_IFELSE( # check if pthread_condattr_setclock(CLOCK_MONOTONIC) is supported saved_LIBS=$LIBS LIBS=$PTHREADLIB -AC_CACHE_CHECK([for pthread_condattr_setclock(CLOCK_MONOTONIC)], - [ss_cv_func_pthread_condattr_setclock_monotonic], - [AC_RUN_IFELSE( - [AC_LANG_SOURCE( - [[#include - int main() { pthread_condattr_t attr; - pthread_condattr_init(&attr); - return pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);}]])], - [ss_cv_func_pthread_condattr_setclock_monotonic=yes], - [ss_cv_func_pthread_condattr_setclock_monotonic=no], - # Check existence of pthread_condattr_setclock if cross-compiling - [AC_CHECK_FUNCS(pthread_condattr_setclock, - ss_cv_func_pthread_condattr_setclock_monotonic=unknown)] - )]) -if test x$ss_cv_func_pthread_condattr_setclock_monotonic = xyes; then - AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC], [], - [pthread_condattr_setclock supports CLOCK_MONOTONIC]) -elif test x$ss_cv_func_pthread_condattr_setclock_monotonic = xunknown; then - AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC], [], - [have pthread_condattr_setclock()]) -fi - +AC_MSG_CHECKING([for pthread_condattr_setclock(CLOCK_MONOTONIC)]) +AC_RUN_IFELSE( + [AC_LANG_SOURCE( + [[#include + int main() { pthread_condattr_t attr; + pthread_condattr_init(&attr); + return pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);}]])], + [AC_MSG_RESULT([yes]); + AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC], [], + [pthread_condattr_setclock supports CLOCK_MONOTONIC])], + [AC_MSG_RESULT([no])], + # Check existence of pthread_condattr_setclock if cross-compiling + [AC_MSG_RESULT([unknown]); + AC_CHECK_FUNCS(pthread_condattr_setclock, + [AC_DEFINE([HAVE_CONDATTR_CLOCK_MONOTONIC], [], + [have pthread_condattr_setclock()])] + )] +) # check if we actually are able to configure attributes on cond vars AC_CHECK_FUNCS(pthread_condattr_init) # instead of pthread_condattr_setclock Android has this function