X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=6a6dfac047bd3be7707839b2448a5a4102fc775b;hp=ac77c8222ae588b6fcb3edfca3917887e168c997;hb=0e636c80aae070dcb89850990053bf3711283340;hpb=6e59ae267ea128cabf21bd08fd77d5576359efb4

diff --git a/configure.ac b/configure.ac
index ac77c8222..6a6dfac04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,18 +4,49 @@ AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
-AM_SILENT_RULES([yes])
+m4_ifdef([AM_SILENT_RULES], [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 \
 ])
 
+AC_ARG_WITH([consumerd32-path],
+	AS_HELP_STRING([--with-consumerd32-path],
+	[Location of the 32-bit consumerd executable]),
+	[CONSUMERD32_PATH="$withval"],
+	[CONSUMERD32_PATH=''])
+AC_SUBST([CONSUMERD32_PATH])
+
+AC_ARG_WITH([consumerd64-path],
+	AS_HELP_STRING([--with-consumerd64-path],
+	[Location of the 64-bit consumerd executable]),
+	[CONSUMERD64_PATH="$withval"],
+	[CONSUMERD64_PATH=''])
+AC_SUBST([CONSUMERD64_PATH])
+
+AC_ARG_WITH([consumerd32-libdir],
+	AS_HELP_STRING([--with-consumerd32-libdir],
+	[Location of the 32-bit consumerd libraries]),
+	[CONSUMERD32_LIBDIR="$withval"],
+	[CONSUMERD32_LIBDIR=''])
+AC_SUBST([CONSUMERD32_LIBDIR])
+
+AC_ARG_WITH([consumer64d-libdir],
+	AS_HELP_STRING([--with-consumerd64-libdir],
+	[Location of the 64-bit consumerd libraries]),
+	[CONSUMERD64_LIBDIR="$withval"],
+	[CONSUMERD64_LIBDIR=''])
+AC_SUBST([CONSUMERD64_LIBDIR])
+
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_PATH], $CONSUMERD32_PATH, [Location of the 32-bit consumerd executable.])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_PATH], $CONSUMERD64_PATH, [Location of the 64-bit consumerd executable])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_LIBDIR], $CONSUMERD32_LIBDIR, [Search for consumerd 32-bit libraries in this location.])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_LIBDIR], $CONSUMERD64_LIBDIR, [Search for consumerd 64-bit libraries in this location.])
+
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],
 	[AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]
@@ -36,6 +67,9 @@ AC_CHECK_DECL([cds_list_add], [],
 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>]]
 )
@@ -49,19 +83,25 @@ 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 <ust/lttng-ust-ctl.h>]]
-)
-AM_CONDITIONAL([LTTNG_TOOLS_HAVE_UST], [ test "x$have_ust_test" = "x1" ])
+# Check liblttng-ust-ctl library
+AC_ARG_ENABLE(lttng-ust,
+	[  --disable-lttng-ust     build without LTTng-UST (Userspace Tracing) support.],
+	lttng_ust_support=$enableval, 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])