X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=ed625263b410332eba23ed1ad45be14de1c89e2c;hb=8f11f9f6903dd865f4394caa0ff625d1bb64e093;hp=e445a327831b31e8deb76c8d5c5a59c33d9e34c8;hpb=4c13f73f92c1cfdab179575450228f482a02135e;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index e445a3278..ed625263b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools], [2.0-pre13], [david.goulet@polymtl.ca], ,[http://lttng.org])
+AC_INIT([lttng-tools], [2.0-pre14], [david.goulet@polymtl.ca], ,[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -13,7 +13,7 @@ AC_CHECK_HEADERS([ \
 ])
 
 # URCU library version needed or newer
-liburcu_version="0.6.0"
+liburcu_version=">= 0.6.5"
 
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],
@@ -25,35 +25,38 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
 	[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
 )
 
-# Check liburcu list.h, wfqueue.h, futex.h
-AC_CHECK_DECL([cds_list_add], [],
-	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]
-)
-
-# Check liburcu
+# Needed for benchmark time
 AC_CHECK_DECL([caa_get_cycles], [],
 	[AC_MSG_ERROR([liburcu liburcu_version or newer is needed])], [[#include <urcu/arch.h>]]
 )
 
+# Check liburcu needed function calls
+AC_CHECK_DECL([cds_list_add], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]
+)
 AC_CHECK_DECL([cds_wfq_init], [],
 	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
 )
-
 AC_CHECK_DECL([futex_async], [],
 	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]
 )
+AC_CHECK_DECL([rcu_thread_offline], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]
+)
+AC_CHECK_DECL([rcu_thread_online], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]
+)
 
+# Epoll check. If not present, the build will fallback on poll() API
 AX_HAVE_EPOLL(
 	[AX_CONFIG_FEATURE_ENABLE(epoll)],
 	[AX_CONFIG_FEATURE_DISABLE(epoll)]
 )
-
 AX_CONFIG_FEATURE(
 	[epoll], [This platform supports epoll(7)],
 	[HAVE_EPOLL], [This platform supports epoll(7).],
 	[enable_epoll="yes"], [enable_epoll="no"]
 )
-
 AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
 
 AC_PROG_CC