Fix benchmark and missing tracepoint

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ffd54e2e6a7b017ed66b76ee74aff7dbfde748f8..322d9f21e17df45608054eda6ae04f4f9b244679 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.0-pre20],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.0.0-rc1],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -51,7 +51,7 @@ AC_ARG_WITH([consumerd32-libdir],
        [CONSUMERD32_LIBDIR=''])
 AC_SUBST([CONSUMERD32_LIBDIR])
 
-AC_ARG_WITH([consumer64d-libdir],
+AC_ARG_WITH([consumerd64-libdir],
        AS_HELP_STRING([--with-consumerd64-libdir],
        [Directory containing the 64-bit consumerd libraries]),
        [CONSUMERD64_LIBDIR="$withval"],
@@ -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"
 
@@ -152,6 +157,7 @@ AC_CONFIG_FILES([
        doc/Makefile
        doc/man/Makefile
        include/Makefile
+       benchmark/Makefile
        src/Makefile
        src/common/Makefile
        src/common/kernel-ctl/Makefile