X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=cd1e0d152f6d6b16214eb84e536c442bc38a8a76;hp=9675ae0b34ae89233717d6484818db8c26d5d054;hb=c70c0ca0e8e46b29376d77b5b4483891cb33679d;hpb=52ffda46b95f627dd67c8e01c01284ddc33336cc

diff --git a/configure.ac b/configure.ac
index 9675ae0b3..cd1e0d152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools], [2.0-pre5], [david.goulet@polymtl.ca], ,[http://lttng.org])
+AC_INIT([lttng-tools], [2.0-pre14], [david.goulet@polymtl.ca], ,[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -6,6 +6,8 @@ AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AM_SILENT_RULES([yes])
 
+AC_CONFIG_HEADERS([include/config.h])
+
 AC_CHECK_HEADERS([ \
 	sys/types.h unistd.h fcntl.h string.h pthread.h limits.h \
 	signal.h stdlib.h sys/un.h sys/socket.h stdlib.h stdio.h \
@@ -22,10 +24,65 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
 	[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
 )
 
-# Check liburcu
+# 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 0.5.4 or newer is needed])], [[#include <urcu/list.h>]]
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]
+)
+AC_CHECK_DECL([cds_wfq_init], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
+)
+AC_CHECK_DECL([cds_wfq_dequeue_blocking], [],
+    [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
+)
+AC_CHECK_DECL([futex_async], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]
+)
+AC_CHECK_DECL([rcu_thread_offline], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]
+)
+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 liblttng-ust-ctl library
+AC_ARG_ENABLE(lttng-ust,
+	[  --disable-lttng-ust     build without LTTng-UST (Userspace Tracing) support.],
+	lttng_ust_support=no, lttng_ust_support=yes)
+
+[
+if test "x$lttng_ust_support" = "xno"; then
+	echo "LTTng-UST support disabled."
+else
+]
+	AC_CHECK_LIB([lttng-ust-ctl], [ustctl_create_session], [],
+		[AC_MSG_ERROR([Cannot find LTTng-UST. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])]
+	)
+[
+	echo "LTTng-UST support enabled."
+fi
+]
+
+AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ])
+
+AC_CHECK_FUNCS([sched_getcpu sysconf])
+
+# Epoll check. If not present, the build will fallback on poll() API
+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
@@ -43,13 +100,13 @@ AC_CONFIG_FILES([
 	Makefile
 	include/Makefile
 	libkernelctl/Makefile
-	liblttkconsumerd/Makefile
+	liblttng-consumer/Makefile
+	liblttng-kconsumer/Makefile
+	liblttng-ustconsumer/Makefile
 	liblttngctl/Makefile
-	liblttsessiondcomm/Makefile
-	libustctl/Makefile
-	libustcomm/Makefile
-	ltt-kconsumerd/Makefile
-	ltt-sessiond/Makefile
+	liblttng-sessiond-comm/Makefile
+	lttng-consumerd/Makefile
+	lttng-sessiond/Makefile
 	lttng/Makefile
 	tests/Makefile
 	doc/Makefile