X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=6fdb2790cd73ca8c68e0168521b49b22b3980e3a;hb=4931a13e87ddbbabe4911e622e78c85b2197ecbf;hp=cbe239691fea17330fda29575fac30e8d6be9dfd;hpb=161239e0409832d65cb773a08d364b29945b18a7;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index cbe23969..6fdb2790 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,14 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([ust], [0.13], [nils dot carlson at ericsson dot com])
+AC_INIT([ust], [1.9.0], [mathieu dot desnoyers at efficios dot com])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AC_CONFIG_SRCDIR([ustctl/ustctl.c])
+AC_CONFIG_SRCDIR([include/ust/tracepoint.h])
 AC_CONFIG_HEADERS([config.h include/ust/config.h])
 AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
 # Compute minor/major version numbers
@@ -26,18 +26,8 @@ AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 
 ## Checks for libraries.
-## FIXME: Replace `main' with a function in `-ldl':
-#AC_CHECK_LIB([dl], [main])
-## FIXME: Replace `main' with a function in `-lmarkers':
-#AC_CHECK_LIB([markers], [main])
-## FIXME: Replace `main' with a function in `-lpthread':
-#AC_CHECK_LIB([pthread], [main])
-## FIXME: Replace `main' with a function in `-ltracectl':
-#AC_CHECK_LIB([tracectl], [main])
-## FIXME: Replace `main' with a function in `-ltracing':
-#AC_CHECK_LIB([tracing], [main])
-## FIXME: Replace `main' with a function in `-lurcu':
-#AC_CHECK_LIB([urcu], [main])
+AC_CHECK_LIB([dl], [dlopen])
+AC_CHECK_LIB([pthread], [pthread_create])
 
 # Checks for header files.
 #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
@@ -70,14 +60,10 @@ AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urc
 This error can also occur when the liburcu package's configure script has not been run.])])
 
 # urcu - check that URCU lib is available to compilation
-AC_CHECK_LIB([urcu-bp], [synchronize_rcu], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
-
-# urcu - check that URCU lib is at least version 0.5.4
-AC_CHECK_LIB([urcu-bp], [rcu_bp_before_fork], [], [AC_MSG_ERROR([liburcu 0.5.4 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])])
-
-# urcu - check that URCU lib is at least version 0.5
-AC_CHECK_DECL([cds_list_add(0, 0)], [], [AC_MSG_ERROR([liburcu 0.5 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])], [[#include <urcu/list.h>]])
+AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
 
+# urcu - check that URCU lib is at least version 0.6
+AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])])
 
 
 # Check for various supplementary host information (beyond the
@@ -155,6 +141,7 @@ AC_CONFIG_FILES([
 	doc/man/Makefile
 	doc/info/Makefile
 	include/Makefile
+	libringbuffer/Makefile
 	libust/Makefile
 	tests/Makefile
 	tests/hello/Makefile
@@ -176,11 +163,6 @@ AC_CONFIG_FILES([
 	tests/exit-fast/Makefile
 	libustinstr-malloc/Makefile
 	libustfork/Makefile
-	libustconsumer/Makefile
-	ust-consumerd/Makefile
-	ustctl/Makefile
-	libustcomm/Makefile
-	libustctl/Makefile
 	snprintf/Makefile
 	ust.pc
 	include/ust/version.h