Add a --with-consumerd-only configure option

This will only build the consumer daemon (and its liblttng-consumer
library), and skip the lttng and lttng-sessiond binaries.

This will be useful when a user wants to support both 32-bit and
64-bit applications on the same system. Only one sessiond is
needed, but we need a consumer for each architecture.

Signed-off-by: Alexandre Montplaisir <alexandre.montplaisir@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/Makefile.am b/Makefile.am
index 44f17148b73a06ffb49577d4710b40c53442f3b2..fa5beea9a9df6ddd0d5cdcdd4ee1d7ea0191cbb2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,14 @@ SUBDIRS = liblttng-sessiond-comm \
                  liblttng-kconsumer \
                  liblttng-ustconsumer \
                  liblttng-consumer \
                  liblttng-kconsumer \
                  liblttng-ustconsumer \
                  liblttng-consumer \

-                 lttng-consumerd \
-                 liblttngctl \
-                 lttng \
-                 lttng-sessiond \
-                 tests \
-                 include \
-                 doc
+                 lttng-consumerd
+
+if ! BUILD_CONSUMERD_ONLY
+SUBDIRS += liblttngctl \
+           lttng \
+           lttng-sessiond
+endif
+
+SUBDIRS += tests \
+           include \
+           doc

diff --git a/configure.ac b/configure.ac
index 01e15d3b2689d2a79cc96f51f8db14ae0b85ccb6..621f091fd9d57db8e9211a416181ac999f48e1d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,13 @@ AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl
 
 AC_CHECK_FUNCS([sched_getcpu sysconf])
 
 
 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)],
 # Epoll check. If not present, the build will fallback on poll() API
 AX_HAVE_EPOLL(
        [AX_CONFIG_FEATURE_ENABLE(epoll)],


@@ -145,7 +152,13 @@ AS_ECHO("")
 
 AS_ECHO_N("Lttng-UST support: ")
 AS_IF([test "x$lttng_ust_support" = "xyes"], [AS_ECHO("Enabled")],
 
 AS_ECHO_N("Lttng-UST support: ")
 AS_IF([test "x$lttng_ust_support" = "xyes"], [AS_ECHO("Enabled")],

-       [AS_ECHO("Disabled")])
+       [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("")
 
 
 AS_ECHO("")