X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=b4a4b9ebb9f8acffd227bb395c175d97333ab0f9;hb=b5c5fc2947ec79834e054e0117414b717faeee4d;hp=0ac64700614204c7ea21efe51405343c6017119a;hpb=f6a9efaa0fe496b7fa4850daa2eae98a240433e1;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index 0ac647006..b4a4b9ebb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,9 +16,6 @@ AC_CHECK_HEADERS([ \
 	getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
 ])
 
-# URCU library version needed or newer
-liburcu_version=">= 0.6.5"
-
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],
 	[AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]
@@ -29,6 +26,9 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
 	[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
 )
 
+# URCU library version needed or newer
+liburcu_version=">= 0.6.6"
+
 # 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>]]
@@ -45,6 +45,11 @@ AC_CHECK_DECL([rcu_thread_offline], [],
 AC_CHECK_DECL([rcu_thread_online], [],
 	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]
 )
+AC_CHECK_DECL([caa_likely], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]
+)
+
+# Check libust library
 AC_CHECK_DECL([ustctl_create_session],
 	[
 		AC_DEFINE([CONFIG_LTTNG_TOOLS_HAVE_UST], 1)
@@ -54,9 +59,8 @@ AC_CHECK_DECL([ustctl_create_session],
 		AC_MSG_WARN([UST header not found. Building without UST support.])
 		have_ust_test=0
 	],
-	[[#include <ust/lttng-ust-ctl.h>]]
+	[[#include <lttng/ust-ctl.h>]]
 )
-
 AM_CONDITIONAL([LTTNG_TOOLS_HAVE_UST], [ test "x$have_ust_test" = "x1" ])
 
 AC_CHECK_FUNCS([sched_getcpu sysconf])
@@ -94,9 +98,8 @@ AC_CONFIG_FILES([
 	liblttng-ustconsumer/Makefile
 	liblttngctl/Makefile
 	liblttng-sessiond-comm/Makefile
-	libustcomm/Makefile
 	lttng-consumerd/Makefile
-	ltt-sessiond/Makefile
+	lttng-sessiond/Makefile
 	lttng/Makefile
 	tests/Makefile
 	doc/Makefile