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

diff --git a/configure.ac b/configure.ac
index 716e97865..53f21ab09 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-pre18],[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