X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=fb2f27864ce9f7c530a3b798b4203c912b2e6eb4;hb=16adecf1f2e80025667ed53f4905e725894f076a;hp=68f41315c9bee4ed00aa60c4f37a89a73f9c0779;hpb=9b3a9a1f8ee47787e50a130b444dae38eee5dca0;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 68f41315..fb2f2786 100644 --- a/configure.ac +++ b/configure.ac @@ -249,22 +249,26 @@ AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xye AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CPPFLAGS]=-Idir to specify their location. This error can also occur when the liburcu package's configure script has not been run.])]) -# URCU library version needed or newer -m4_define([WRONG_LIBURCU_MSG], [Userspace RCU (liburcu) >= 0.11.0 is needed]) - -#Macro added in urcu 0.6.6 -AC_CHECK_DECL([caa_likely], [], - [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]]) -#Macro added in urcu 0.11.0 -AC_CHECK_DECL([DEFINE_URCU_TLS_IE], [], - [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]] -) - # urcu-cds - check that URCU Concurrent Data Structure lib is available to compilation # Part of Userspace RCU library 0.7.2 or better. AC_CHECK_LIB([urcu-cds], [_cds_lfht_new], [], [AC_MSG_ERROR([Cannot find liburcu-cds lib, part of Userspace RCU 0.7 or better. Use [LDFLAGS]=-Ldir to specify its location.])]) +AC_MSG_CHECKING([caa_likely()]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + void fct(void) + { + if (caa_likely(1)) { + } + } +]])], [ + AC_MSG_RESULT([yes]) +], [ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([Please upgrade your version of liburcu to 0.6.6 or better]) +]) + # urcu - check that URCU lib is available to compilation AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])