Fix makefile

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5eb64a5f9cd47b2c1973587b9c6ca897d4c7c325..b8864296276dbb5d92c70078de408165c1fa51a8 100644 (file)
--- 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-pre10], [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,40 +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 libustctl
-AC_CHECK_LIB([ustctl], [ustctl_connect_pid], [],
-       [AC_MSG_ERROR([Cannot find libustctl. 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
+       liblttng-sessiond-comm/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