Merge branch 'master' into benchmark

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 02698885375515674b0ee2f68795dbd5dd67c05f..8a1c162b6e658bdca7030c020868058212e4a2cb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,15 @@ AC_CHECK_DECL([cds_list_add], [],
        [AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/list.h>]]
 )
 
+<<<<<<< HEAD
+# Check liburcu
+AC_CHECK_DECL([caa_get_cycles], [],
+       [AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/arch.h>]]
+=======
 # Check liburcu wfqueue.h
 AC_CHECK_DECL([cds_wfq_init], [],
        [AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/wfqueue.h>]]
+>>>>>>> master
 )
 
 AC_PROG_CC
@@ -47,6 +53,7 @@ AC_SUBST(DEFAULT_INCLUDES)
 AC_CONFIG_FILES([
        Makefile
        include/Makefile
+       benchmark/Makefile
        libkernelctl/Makefile
        liblttngkconsumerd/Makefile
        liblttngctl/Makefile