Remove the --consumerd-only from the configure

Fixes #712

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/configure.ac b/configure.ac
index a8fd7f7ecff3f785e59a5960b8c0bd25763459c9..5c5562e59cf33dce260dcd18bf1b958bc65046e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -295,13 +295,6 @@ else
 
 fi
 
-# 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)],

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index ce5057dd7512c007dccb6ca9fa36287f10d9b002..c97d1a147ce65fe0868c5ccebe272b3949b1bd62 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,9 +1,6 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = lttng-consumerd
-
-if ! BUILD_CONSUMERD_ONLY
-SUBDIRS += lttng \
-           lttng-sessiond \
-           lttng-relayd
-endif
+SUBDIRS = lttng-consumerd \
+                 lttng \
+          lttng-sessiond \
+          lttng-relayd