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

diff --git a/configure.ac b/configure.ac
index 6a6dfac04..ba5f7bde8 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.],
+	AS_HELP_STRING([--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
-]
+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
+m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
 
 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("")
+