X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=621f091fd9d57db8e9211a416181ac999f48e1d3;hp=287b67ddb64cf6ca1ddad7c0dfaee115698ab9e6;hb=3889a2d65e6e9d7a9a6e55871dda4b0c8068cb00;hpb=a4b279ba6de3b49b15cd0e93194d764b0eaa30a4

diff --git a/configure.ac b/configure.ac
index 287b67ddb..621f091fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools], [2.0-pre14], [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
@@ -85,26 +85,26 @@ AC_CHECK_DECL([caa_likely], [],
 
 # 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
-]
+	AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]),
+	lttng_ust_support=$enableval, lttng_ust_support=yes)
+
+AS_IF([test "x$lttng_ust_support" = "xyes"], [
 	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])
 
+# Option to only build the consumer daemon and its libraries
+AC_ARG_WITH([consumerd-only],
+	AS_HELP_STRING([--with-consumerd-only],[Only build the consumer daemon [default=no]]),
+	[consumerd_only=$withval],
+	[consumerd_only=no])
+AM_CONDITIONAL([BUILD_CONSUMERD_ONLY], [test "x$consumerd_only" = "xyes"])
+
 # Epoll check. If not present, the build will fallback on poll() API
 AX_HAVE_EPOLL(
 	[AX_CONFIG_FEATURE_ENABLE(epoll)],
@@ -118,7 +118,7 @@ AX_CONFIG_FEATURE(
 AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
 
 AC_PROG_CC
-AC_PROG_LIBTOOL
+LT_INIT
 
 CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
 
@@ -146,3 +146,19 @@ AC_CONFIG_FILES([
 ])
 
 AC_OUTPUT
+
+# Mini-report on what will be built
+AS_ECHO("")
+
+AS_ECHO_N("Lttng-UST support: ")
+AS_IF([test "x$lttng_ust_support" = "xyes"], [AS_ECHO("Enabled")],
+	[AS_ECHO("Disabled")]
+)
+
+AS_IF([test "x$consumerd_only" = "xyes"],
+	[AS_ECHO("Only the consumerd daemon will be built.")],
+	[AS_ECHO("All binaries will be built.")]
+)
+
+AS_ECHO("")
+