Move libconsumer under common/consumer/

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c2f49d52d29c3662aa117d69f395fcbb05b21f57..ceaf3771520674a2fee3f38d38b71f1759d38844 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -604,6 +604,7 @@ AC_CONFIG_FILES([
        src/common/Makefile
        src/common/kernel-ctl/Makefile
        src/common/kernel-consumer/Makefile
+       src/common/consumer/Makefile
        src/common/ust-consumer/Makefile
        src/common/hashtable/Makefile
        src/common/sessiond-comm/Makefile
@@ -752,13 +753,6 @@ AS_IF([test "x${enable_python_binding:-yes}" = xyes], [
        AS_ECHO("Disabled")
 ])
 
-# Do we build only the consumerd, or everything
-AS_IF([test "x$consumerd_only" = "xyes"],[
-       AS_ECHO("Only the consumerd daemon will be built.")
-],[
-       AS_ECHO("All binaries will be built.")
-])
-
 # Print the bindir and libdir this `make install' will install into.
 AS_ECHO()
 AS_ECHO_N("Binaries will be installed in:  ")
@@ -767,47 +761,45 @@ AS_ECHO_N("Libraries will be installed in: ")
 AS_ECHO("`eval eval echo $libdir`")
 
 # If we build the sessiond, print the paths it will use
-AS_IF([test "x$consumerd_only" = "xno"],[
-       AS_ECHO()
-       AS_ECHO_N("The lttng command will look for the lttng-sessiond executable at: ")
-       AS_IF([test "$SESSIOND_BIN" = ""],[
-               AS_ECHO_N("`eval eval echo $bindir`")
-               AS_ECHO("/lttng-sessiond")
-       ],[
-               AS_ECHO("$SESSIOND_BIN")
-       ])
+AS_ECHO()
+AS_ECHO_N("The lttng command will search for the lttng-sessiond executable at: ")
+AS_IF([test "$SESSIOND_BIN" = ""],[
+       AS_ECHO_N("`eval eval echo $bindir`")
+       AS_ECHO("/lttng-sessiond")
+],[
+       AS_ECHO("$SESSIOND_BIN")
+])
 
-       AS_ECHO()
-       AS_ECHO("The sessiond daemon will look in the following directories: ")
-       AS_ECHO_N("32-bit consumerd executable at: ")
-       AS_IF([test "$CONSUMERD32_BIN" = ""],[
-               AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
-               AS_ECHO("/lttng-consumerd")
-       ],[
-               AS_ECHO("$CONSUMERD32_BIN")
-       ])
+AS_ECHO()
+AS_ECHO("The sessiond daemon will search the following directories: ")
+AS_ECHO_N("32-bit consumerd executable: ")
+AS_IF([test "$CONSUMERD32_BIN" = ""],[
+       AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
+       AS_ECHO("/lttng-consumerd")
+],[
+       AS_ECHO("$CONSUMERD32_BIN")
+])
 
-       AS_ECHO_N("32-bit consumer libraries in:   ")
-       AS_IF([test "$CONSUMERD32_LIBDIR" = ""],[
-               AS_ECHO("`eval eval echo $libdir`")
-       ],[
-               AS_ECHO("$CONSUMERD32_LIBDIR")
-       ])
+AS_ECHO_N("32-bit consumer libraries:   ")
+AS_IF([test "$CONSUMERD32_LIBDIR" = ""],[
+       AS_ECHO("`eval eval echo $libdir`")
+],[
+       AS_ECHO("$CONSUMERD32_LIBDIR")
+])
 
-       AS_ECHO_N("64-bit consumerd executable at: ")
-       AS_IF([test "$CONSUMERD64_BIN" = ""],[
-               AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
-               AS_ECHO("/lttng-consumerd")
-       ],[
-               AS_ECHO("$CONSUMERD64_BIN")
-       ])
+AS_ECHO_N("64-bit consumerd executable: ")
+AS_IF([test "$CONSUMERD64_BIN" = ""],[
+       AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
+       AS_ECHO("/lttng-consumerd")
+],[
+       AS_ECHO("$CONSUMERD64_BIN")
+])
 
-       AS_ECHO_N("64-bit consumer libraries in:   ")
-       AS_IF([test "$CONSUMERD64_LIBDIR" = ""],[
-               AS_ECHO("`eval eval echo $libdir`")
-       ],[
-               AS_ECHO("$CONSUMERD64_LIBDIR")
-       ])
+AS_ECHO_N("64-bit consumer libraries:   ")
+AS_IF([test "$CONSUMERD64_LIBDIR" = ""],[
+       AS_ECHO("`eval eval echo $libdir`")
+],[
+       AS_ECHO("$CONSUMERD64_LIBDIR")
 ])
 
 AS_ECHO()