X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=716e97865d8d6959f4075bf9299664b8f0827259;hp=3c0c12c3c41bc115b1d2b0508cc74da282f59641;hb=5fb528f1fdb74ddc70706a1c786efa2debe7bf16;hpb=08a2aa63d6413feec27a3bf1073a96ccb6c1ea2f

diff --git a/configure.ac b/configure.ac
index 3c0c12c3c..716e97865 100644
--- 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
@@ -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
@@ -147,18 +149,81 @@ AC_CONFIG_FILES([
 
 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()