X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=f98c874a660520cb76537d118fb33e411f7a79e5;hp=c7941a86e2ec1bd68f3c3841ae1f3aed53038b43;hb=734f79bf717d87817623d382c59086dc9e8ef610;hpb=994dd8a4dd68257854a1b00f875e9b1608375749 diff --git a/configure.ac b/configure.ac index c7941a86e..f98c874a6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([lttng-tools],[2.0-pre16],[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], [], @@ -144,6 +144,8 @@ AC_CONFIG_FILES([ lttng-sessiond/Makefile lttng/Makefile tests/Makefile + tests/ust-nevents/Makefile + tests/ust-nprocesses/Makefile doc/Makefile ]) @@ -183,6 +185,13 @@ AS_IF([test "x$consumerd_only" = "xyes"],[ 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()