X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=ed625263b410332eba23ed1ad45be14de1c89e2c;hb=2c58cc2eccbb85063cc547c0259d276a2be5c0a4;hp=c1bff453f9f3add803e7b83a0d6c82db70d5a295;hpb=904ebd226416bbf7b86e921d19ba9858ea056ce0;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index c1bff453f..ed625263b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools], [2.0-pre12], [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,23 +25,39 @@ 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
 AC_PROG_LIBTOOL