X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=ff950cd796648e8cbe06099816b49c272bbe651a;hp=fdc8b6ff568cb9e952c9c4b8b57b2d35d05c29e0;hb=d6309f5907981526e78078dfb87419fbd267f270;hpb=97b1a726be0f1779f5508543c58521d774312e73

diff --git a/configure.ac b/configure.ac
index fdc8b6ff5..ff950cd79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,24 @@
-AC_INIT([lttng-tools], [0.0.1], [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
 AC_CONFIG_MACRO_DIR([config])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AM_SILENT_RULES([yes])
 
+AC_CONFIG_HEADERS([include/config.h])
+
+AH_TEMPLATE([CONFIG_LTTNG_TOOLS_HAVE_UST], [Defined on systems where UST headers can be found.])
+
 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 \
 	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.])]
@@ -20,29 +29,76 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
 	[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
 )
 
-# Check liburcu
+# 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([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([ustctl_create_session],
+	[
+		AC_DEFINE([CONFIG_LTTNG_TOOLS_HAVE_UST], 1)
+		have_ust_test=1
+	],
+	[
+		AC_MSG_WARN([UST header not found. Building without UST support.])
+		have_ust_test=0
+	],
+	[[#include <ust/lttng-ust-ctl.h>]]
 )
 
-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+AM_CONDITIONAL([LTTNG_TOOLS_HAVE_UST], [ test "x$have_ust_test" = "x1" ])
+
+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
 
+CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir)"
+
+lttngincludedir="${includedir}/lttng"
+
+AC_SUBST(lttngincludedir)
+AC_SUBST(DEFAULT_INCLUDES)
+
 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
+	liblttng-sessiond-comm/Makefile
+	lttng-consumerd/Makefile
 	ltt-sessiond/Makefile
 	lttng/Makefile
 	tests/Makefile
+	doc/Makefile
 ])
 
 AC_OUTPUT