Merge branch 'master' into benchmark

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a0f0bad1619f7b08640afada7bf4e74050f4c5fb..4bfff84bab4c99fb01e4fb4219d85fc714c9707d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,11 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
        [AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
 )
 
+# Needed for benchmark time
+AC_CHECK_DECL([caa_get_cycles], [],
+       [AC_MSG_ERROR([liburcu liburcu_version or newer is needed])], [[#include <urcu/arch.h>]]
+)
+
 # URCU library version needed or newer
 liburcu_version=">= 0.6.7"
 
@@ -170,6 +175,7 @@ AC_CONFIG_FILES([
        doc/Makefile
        doc/man/Makefile
        include/Makefile
+       benchmark/Makefile
        src/Makefile
        src/common/Makefile
        src/common/kernel-ctl/Makefile