X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=ce24a1a24a67c03d2d6439887955e908883430bf;hb=b35d179d7be2ab0cb4a9c698b86d78928089fc39;hp=e32f11e628963efdf64d914c1cb7b9b5e80f7827;hpb=cfa0520d911287f5c470d74272c578bc041077bf;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index e32f11e6..ce24a1a2 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])
@@ -72,8 +62,8 @@ This error can also occur when the liburcu package's configure script has not be
 # urcu - check that URCU lib is available to compilation
 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.5.5
-AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.5.5 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.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
@@ -151,6 +141,8 @@ AC_CONFIG_FILES([
 	doc/man/Makefile
 	doc/info/Makefile
 	include/Makefile
+	liblttng-ust-comm/Makefile
+	libringbuffer/Makefile
 	libust/Makefile
 	tests/Makefile
 	tests/hello/Makefile
@@ -172,11 +164,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