Update version to 2.0-pre19

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c7941a86e2ec1bd68f3c3841ae1f3aed53038b43..42ecd040ea5ffa225f87a12eb71b28ad15fbfc29 100644 (file)
--- 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-pre19],[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], [],
@@ -122,7 +122,7 @@ LT_INIT
 
 CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
 
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir)"
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include"
 
 lttngincludedir="${includedir}/lttng"
 
@@ -131,20 +131,24 @@ AC_SUBST(DEFAULT_INCLUDES)
 
 AC_CONFIG_FILES([
        Makefile
+       doc/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
+       src/Makefile
+       src/common/Makefile
+       src/common/kernel-ctl/Makefile
+       src/common/kernel-consumer/Makefile
+       src/common/ust-consumer/Makefile
+       src/common/hashtable/Makefile
+       src/common/sessiond-comm/Makefile
+       src/lib/Makefile
+       src/lib/lttng-ctl/Makefile
+       src/bin/Makefile
+       src/bin/lttng-consumerd/Makefile
+       src/bin/lttng-sessiond/Makefile
+       src/bin/lttng/Makefile
        tests/Makefile
-       doc/Makefile
+       tests/ust-nevents/Makefile
+       tests/ust-nprocesses/Makefile
 ])
 
 AC_OUTPUT
@@ -183,6 +187,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()