X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=fd2b607e5b9e8972f9cf969208411a83dcdbcd59;hp=441230f885eeb32a1397d142b18a88cc2150878f;hb=223be86b3f1e2750e9d0bf6e022f2696e84c07d7;hpb=62d3069fe1d56bf9f95f9100f21758c3d99dccf6

diff --git a/configure.ac b/configure.ac
index 441230f88..fd2b607e5 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-pre1], [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([ \
@@ -20,37 +22,37 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
 	[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
 )
 
-# Check libuuid
-AC_CHECK_LIB([uuid], [uuid_generate], [],
-	[AC_MSG_ERROR([Cannot find libuuid. Use [LDFLAGS]=-Ldir to specify its location.])]
-)
-
 # Check liburcu
-AC_CHECK_LIB([urcu], [synchronize_rcu], [],
-	[AC_MSG_ERROR([Cannot find liburcu. Use [LDFLAGS]=-Ldir to specify its location.])]
-)
 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
 	libustctl/Makefile
 	libustcomm/Makefile
+	ltt-kconsumerd/Makefile
 	ltt-sessiond/Makefile
 	lttng/Makefile
-	kconsumerd/Makefile
 	tests/Makefile
-	tests/ltt-sessiond/Makefile
+	doc/Makefile
 ])
 
 AC_OUTPUT