From 4f061d4cf16d6625ed8649095ee6df6922b5262a Mon Sep 17 00:00:00 2001 From: David Goulet Date: Fri, 23 May 2014 14:20:43 -0400 Subject: [PATCH] Remove the --consumerd-only from the configure Fixes #712 Signed-off-by: David Goulet --- configure.ac | 7 ------- src/bin/Makefile.am | 11 ++++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index a8fd7f7ec..5c5562e59 100644 --- 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 ce5057dd7..c97d1a147 100644 --- 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 -- 2.34.1