X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=b38b0e2ea8990832faabe978aade15fe43e02908;hb=7a3d132871a4414b6cd232e7f41e6a1f50d9bf16;hp=96f1f1bd7b76eb1a9fc94ce8b2c0878cb6fb1fdc;hpb=6e0ca3c2c2afedf4a944cec63a6a566f7014c93f;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index 96f1f1bd7..b38b0e2ea 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-pre13], [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([ \
@@ -10,6 +12,9 @@ AC_CHECK_HEADERS([ \
 	getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
 ])
 
+# URCU library version needed or newer
+liburcu_version=">= 0.6.5"
+
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],
 	[AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]
@@ -20,38 +25,61 @@ 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 needed function calls
+AC_CHECK_DECL([cds_list_add], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]
 )
-
-# Check libustctl
-AC_CHECK_LIB([ustctl], [ustctl_connect_pid], [],
-	[AC_MSG_ERROR([Cannot find libustctl. Use [LDFLAGS]=-Ldir to specify its location.])]
+AC_CHECK_DECL([cds_wfq_init], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
 )
-
-# Check liburcu
-AC_CHECK_LIB([urcu], [synchronize_rcu], [],
-	[AC_MSG_ERROR([Cannot find liburcu. Use [LDFLAGS]=-Ldir to specify its location.])]
+AC_CHECK_DECL([futex_async], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]
 )
-AC_CHECK_DECL([cds_list_add], [],
-	[AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/list.h>]]
+AC_CHECK_DECL([rcu_thread_offline], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]
+)
+AC_CHECK_DECL([rcu_thread_online], [],
+	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu.h>]]
 )
 
-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+# Epoll check. If not present, the build will fallback on poll() API
+AX_HAVE_EPOLL(
+	[AX_CONFIG_FEATURE_ENABLE(epoll)],
+	[AX_CONFIG_FEATURE_DISABLE(epoll)]
+)
+AX_CONFIG_FEATURE(
+	[epoll], [This platform supports epoll(7)],
+	[HAVE_EPOLL], [This platform supports epoll(7).],
+	[enable_epoll="yes"], [enable_epoll="no"]
+)
+AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
 
 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
+	liblttngkconsumerd/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