X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=f98c874a660520cb76537d118fb33e411f7a79e5;hp=65b352c7d4205406dc7eea3eaf27a4da81aed3b6;hb=734f79bf717d87817623d382c59086dc9e8ef610;hpb=31ff12ffff7d182a1e032b56bfb7111f8550d230

diff --git a/configure.ac b/configure.ac
index 65b352c7d..f98c874a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.0-pre15],[david.goulet@polymtl.ca],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.0-pre17],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -42,10 +42,10 @@ AC_ARG_WITH([consumer64d-libdir],
 	[CONSUMERD64_LIBDIR=''])
 AC_SUBST([CONSUMERD64_LIBDIR])
 
-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.])
+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.])
 
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],
@@ -132,33 +132,100 @@ 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
 	tests/Makefile
+	tests/ust-nevents/Makefile
+	tests/ust-nprocesses/Makefile
 	doc/Makefile
 ])
 
 AC_OUTPUT
 
+#
 # Mini-report on what will be built
-AS_ECHO("")
-
+#
+AS_ECHO()
+
+# Target architecture we're building for
+target_arch=$host_cpu
+[
+for f in $CFLAGS; do
+        if test $f = "-m32"; then
+			target_arch="32-bit"
+        elif test $f = "-m64"; then
+			target_arch="64-bit"
+        fi
+done
+]
+AS_ECHO_N("Target architecture: ")
+AS_ECHO($target_arch)
+
+# LTTng-UST enabled/disabled
 AS_ECHO_N("Lttng-UST support: ")
-AS_IF([test "x$lttng_ust_support" = "xyes"], [AS_ECHO("Enabled")],
-	[AS_ECHO("Disabled")]
-)
+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.")]
-)
+# 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:  ")
+AS_ECHO("`eval eval echo $bindir`")
+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("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 $bindir`")
+		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("64-bit consumerd executable at: ")
+	AS_IF([test "$CONSUMERD64_BIN" = ""],[
+		AS_ECHO_N("`eval eval echo $bindir`")
+		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("")
+AS_ECHO()