Make consumer verbose only with --verbose-consumer option

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d0a372a0c6eca4dd0b53be5ac847f929c5a00342..6bddf8783c61556ea368408f30115ee566167011 100644 (file)
--- 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-pre16],[david.goulet@polymtl.ca],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -14,36 +14,36 @@ AC_CHECK_HEADERS([ \
        getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
 ])
 
-AC_ARG_WITH([consumerd32-path],
-       AC_HELP_STRING([--with-consumerd32-path],
-       [Location of the 32-bit consumerd executable]),
-       [CONSUMERD32_PATH="$withval"],
-       [CONSUMERD32_PATH=''])
-AC_SUBST([CONSUMERD32_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-path],
-       AC_HELP_STRING([--with-consumerd64-path],
-       [Location of the 64-bit consumerd executable]),
-       [CONSUMERD64_PATH="$withval"],
-       [CONSUMERD64_PATH=''])
-AC_SUBST([CONSUMERD64_PATH])
+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],
-       AC_HELP_STRING([--with-consumerd32-libdir],
-       [Location of the 32-bit consumerd libraries]),
+       AS_HELP_STRING([--with-consumerd32-libdir],
+       [Directory containing the 32-bit consumerd libraries]),
        [CONSUMERD32_LIBDIR="$withval"],
        [CONSUMERD32_LIBDIR=''])
 AC_SUBST([CONSUMERD32_LIBDIR])
 
 AC_ARG_WITH([consumer64d-libdir],
-       AC_HELP_STRING([--with-consumerd64-libdir],
-       [Location of the 64-bit consumerd libraries]),
+       AS_HELP_STRING([--with-consumerd64-libdir],
+       [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.])
 
@@ -58,7 +58,7 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
 )
 
 # URCU library version needed or newer
-liburcu_version=">= 0.6.6"
+liburcu_version=">= 0.6.7"
 
 # Check liburcu needed function calls
 AC_CHECK_DECL([cds_list_add], [],
@@ -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.],
-       lttng_ust_support=no, lttng_ust_support=yes)
-
-[
-if test "x$lttng_ust_support" = "xno"; then
-       echo "LTTng-UST support disabled."
-else
-]
+       AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]),
+       lttng_ust_support=$enableval, lttng_ust_support=yes)
+
+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
+LT_INIT
 
 CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
 
@@ -132,12 +132,14 @@ AC_SUBST(DEFAULT_INCLUDES)
 AC_CONFIG_FILES([
        Makefile
        include/Makefile
+       common/Makefile
        libkernelctl/Makefile
        liblttng-consumer/Makefile
        liblttng-kconsumer/Makefile
        liblttng-ustconsumer/Makefile
        liblttngctl/Makefile
        liblttng-sessiond-comm/Makefile
+       liblttng-ht/Makefile
        lttng-consumerd/Makefile
        lttng-sessiond/Makefile
        lttng/Makefile
@@ -146,3 +148,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("")
+