Add target arch and paths to the configure output

The two eval's are needed to correctly expand the variables in the
default path.

Signed-off-by: Alexandre Montplaisir <alexandre.montplaisir@gmail.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/configure.ac b/configure.ac
index 6bddf8783c61556ea368408f30115ee566167011..c7941a86e2ec1bd68f3c3841ae1f3aed53038b43 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -149,18 +149,74 @@ 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.")
+])
+
+# 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()