X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=d737657f438e76551ba6687c82d2657c3898fd0d;hp=b7597be8449668a3d9e6198923acf97d6d8e24d4;hb=ca3c5ac0cf100d80352a1a81936b5adc47942f35;hpb=f10719180ada8b6aec080a8f81aeae1b673edbb8

diff --git a/configure.ac b/configure.ac
index b7597be84..d737657f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,9 @@
-AC_INIT([lttng-tools], [0.0.1], [david.goulet@polymtl.ca], [http://lttng.org])
+AC_INIT([lttng-tools], [2.0-pre9], [david.goulet@polymtl.ca], ,[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AM_SILENT_RULES([yes])
 
 AC_CHECK_HEADERS([ \
@@ -25,25 +27,32 @@ AC_CHECK_DECL([cds_list_add], [],
 	[AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/list.h>]]
 )
 
-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
-
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
+CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir)"
+
+lttngincludedir="${includedir}/lttng"
+
+AC_SUBST(lttngincludedir)
+AC_SUBST(DEFAULT_INCLUDES)
+
 AC_CONFIG_FILES([
 	Makefile
 	include/Makefile
 	libkernelctl/Makefile
 	liblttkconsumerd/Makefile
 	liblttngctl/Makefile
-	liblttsessiondcomm/Makefile
+	liblttng-sessiond-comm/Makefile
 	libustctl/Makefile
 	libustcomm/Makefile
 	ltt-kconsumerd/Makefile
 	ltt-sessiond/Makefile
 	lttng/Makefile
 	tests/Makefile
-	tests/ltt-sessiond/Makefile
+	doc/Makefile
 ])
 
 AC_OUTPUT