Fix configure.ac using new UST headers location

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c7dd21ec34bd685d0548c7a1e320c6cdb446fa4a..b4a4b9ebb9f8acffd227bb395c175d97333ab0f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,15 +6,16 @@ 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 \
        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.])]
@@ -25,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>]]
@@ -41,6 +45,25 @@ 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)
+               have_ust_test=1
+       ],
+       [
+               AC_MSG_WARN([UST header not found. Building without UST support.])
+               have_ust_test=0
+       ],
+       [[#include <lttng/ust-ctl.h>]]
+)
+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(
@@ -70,13 +93,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
-       ltt-sessiond/Makefile
+       lttng-consumerd/Makefile
+       lttng-sessiond/Makefile
        lttng/Makefile
        tests/Makefile
        doc/Makefile