UST 2.0 support

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c7dd21ec34bd685d0548c7a1e320c6cdb446fa4a..052c5a33d902cd121f4b5cb88f4dcb118eefcfb1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,10 @@ AC_CONFIG_MACRO_DIR([config])
 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 \
@@ -41,6 +45,19 @@ 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([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>]]
+)
+
+AM_CONDITIONAL([LTTNG_TOOLS_HAVE_UST], [ test "x$have_ust_test" = "x1" ])
 
 # Epoll check. If not present, the build will fallback on poll() API
 AX_HAVE_EPOLL(
@@ -70,12 +87,13 @@ AC_CONFIG_FILES([
        Makefile
        include/Makefile
        libkernelctl/Makefile
-       liblttngkconsumerd/Makefile
+       liblttng-consumer/Makefile
+       liblttng-kconsumer/Makefile
+       liblttng-ustconsumer/Makefile
        liblttngctl/Makefile
        liblttng-sessiond-comm/Makefile
-       libustctl/Makefile
        libustcomm/Makefile
-       ltt-kconsumerd/Makefile
+       lttng-consumerd/Makefile
        ltt-sessiond/Makefile
        lttng/Makefile
        tests/Makefile