Flush UST buffers after stop and wait quiescent

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 01e15d3b2689d2a79cc96f51f8db14ae0b85ccb6..f5e4c366ab30450000304968667bf7ab484c5ed2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,36 +14,36 @@ AC_CHECK_HEADERS([ \
        getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
 ])
 
-AC_ARG_WITH([consumerd32-path],
-       AS_HELP_STRING([--with-consumerd32-path],
-       [Location of the 32-bit consumerd executable]),
-       [CONSUMERD32_PATH="$withval"],
-       [CONSUMERD32_PATH=''])
-AC_SUBST([CONSUMERD32_PATH])
-
-AC_ARG_WITH([consumerd64-path],
-       AS_HELP_STRING([--with-consumerd64-path],
-       [Location of the 64-bit consumerd executable]),
-       [CONSUMERD64_PATH="$withval"],
-       [CONSUMERD64_PATH=''])
-AC_SUBST([CONSUMERD64_PATH])
+AC_ARG_WITH([consumerd32-bin],
+       AS_HELP_STRING([--with-consumerd32-bin],
+       [Location of the 32-bit consumerd executable (including the filename)]),
+       [CONSUMERD32_BIN="$withval"],
+       [CONSUMERD32_BIN=''])
+AC_SUBST([CONSUMERD32_BIN])
+
+AC_ARG_WITH([consumerd64-bin],
+       AS_HELP_STRING([--with-consumerd64-bin],
+       [Location of the 64-bit consumerd executable (including the filename)]),
+       [CONSUMERD64_BIN="$withval"],
+       [CONSUMERD64_BIN=''])
+AC_SUBST([CONSUMERD64_BIN])
 
 AC_ARG_WITH([consumerd32-libdir],
        AS_HELP_STRING([--with-consumerd32-libdir],
-       [Location of the 32-bit consumerd libraries]),
+       [Directory containing the 32-bit consumerd libraries]),
        [CONSUMERD32_LIBDIR="$withval"],
        [CONSUMERD32_LIBDIR=''])
 AC_SUBST([CONSUMERD32_LIBDIR])
 
 AC_ARG_WITH([consumer64d-libdir],
        AS_HELP_STRING([--with-consumerd64-libdir],
-       [Location of the 64-bit consumerd libraries]),
+       [Directory containing the 64-bit consumerd libraries]),
        [CONSUMERD64_LIBDIR="$withval"],
        [CONSUMERD64_LIBDIR=''])
 AC_SUBST([CONSUMERD64_LIBDIR])
 
-AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_PATH], $CONSUMERD32_PATH, [Location of the 32-bit consumerd executable.])
-AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_PATH], $CONSUMERD64_PATH, [Location of the 64-bit consumerd executable])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_BIN], $CONSUMERD32_BIN, [Location of the 32-bit consumerd executable.])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_BIN], $CONSUMERD64_BIN, [Location of the 64-bit consumerd executable])
 AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_LIBDIR], $CONSUMERD32_LIBDIR, [Search for consumerd 32-bit libraries in this location.])
 AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_LIBDIR], $CONSUMERD64_LIBDIR, [Search for consumerd 64-bit libraries in this location.])
 
@@ -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])
 
+# 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)],
@@ -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("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("")