Merge branch 'master' into benchmark

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f30b8329d44f9003431207d59db0fdec6074c7c9..e445a327831b31e8deb76c8d5c5a59c33d9e34c8 100644 (file)
--- 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-pre13], [david.goulet@polymtl.ca], ,[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -30,6 +30,11 @@ AC_CHECK_DECL([cds_list_add], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]
 )
 
+# Check liburcu
+AC_CHECK_DECL([caa_get_cycles], [],
+       [AC_MSG_ERROR([liburcu liburcu_version or newer is needed])], [[#include <urcu/arch.h>]]
+)
+
 AC_CHECK_DECL([cds_wfq_init], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
 )
@@ -38,6 +43,19 @@ AC_CHECK_DECL([futex_async], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]
 )
 
+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
 
@@ -53,6 +71,7 @@ AC_SUBST(DEFAULT_INCLUDES)
 AC_CONFIG_FILES([
        Makefile
        include/Makefile
+       benchmark/Makefile
        libkernelctl/Makefile
        liblttngkconsumerd/Makefile
        liblttngctl/Makefile