X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=7e35c06458fc081340b448c85d75b9c18bc94bae;hp=f1d4a366e80263ae178fb118a083c1455431b674;hb=86a96e6cf3b4bab2fc7edd0db1b7c87c2374d27a;hpb=2ad3a9a03e56a52b68d9c2e6046e31da9bc6c4ef

diff --git a/configure.ac b/configure.ac
index f1d4a366e..7e35c0645 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.1.0-rc8],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.1.0],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -108,8 +108,29 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
 	[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
 )
 
+# Check for libuuid
+AC_CHECK_LIB([uuid], [uuid_generate],
+[
+	AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.])
+	have_libuuid=yes
+],
+[
+	# libuuid not found, check for uuid_create in libc.
+	AC_CHECK_LIB([c], [uuid_create],
+	[
+		AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBC_UUID], 1, [Has libc uuid support.])
+		have_libc_uuid=yes
+	],
+	[
+		AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
+	])
+]
+)
+AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])
+AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"])
+
 # URCU library version needed or newer
-liburcu_version=">= 0.6.7"
+liburcu_version=">= 0.7.2"
 
 # Check liburcu needed function calls
 AC_CHECK_DECL([cds_list_add], [],
@@ -145,12 +166,12 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
 			AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1], [has LTTng-UST control support])
 			lttng_ust_ctl_found=yes
 		],
-		[AC_MSG_ERROR([Cannot find LTTng-UST. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])],
+		[AC_MSG_ERROR([Cannot find LTTng-UST 2.1.x. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])],
 		[-lurcu-common -lurcu-bp -lurcu-cds -lrt]
 	)
 ])
 AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])
-AC_CHECK_FUNCS([sched_getcpu sysconf])
+AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range])
 
 # check for dlopen
 AC_CHECK_LIB([dl], [dlopen],
@@ -281,25 +302,30 @@ AC_CONFIG_FILES([
 	src/lib/Makefile
 	src/lib/lttng-ctl/Makefile
 	src/lib/lttng-ctl/filter/Makefile
+	src/lib/lttng-ctl/lttng-ctl.pc
 	src/bin/Makefile
 	src/bin/lttng-consumerd/Makefile
 	src/bin/lttng-sessiond/Makefile
 	src/bin/lttng-relayd/Makefile
 	src/bin/lttng/Makefile
 	tests/Makefile
-	tests/kernel/Makefile
-	tests/tools/Makefile
-	tests/tools/streaming/Makefile
-	tests/tools/filtering/Makefile
-	tests/tools/health/Makefile
-	tests/ust/Makefile
-	tests/ust/nprocesses/Makefile
-	tests/ust/high-throughput/Makefile
-	tests/ust/low-throughput/Makefile
-	tests/ust/before-after/Makefile
-	tests/ust/multi-session/Makefile
-	tests/ust/overlap/Makefile
-	tests/ust/overlap/demo/Makefile
+	tests/regression/Makefile
+	tests/regression/kernel/Makefile
+	tests/regression/tools/Makefile
+	tests/regression/tools/streaming/Makefile
+	tests/regression/tools/filtering/Makefile
+	tests/regression/tools/health/Makefile
+	tests/regression/ust/Makefile
+	tests/regression/ust/nprocesses/Makefile
+	tests/regression/ust/high-throughput/Makefile
+	tests/regression/ust/low-throughput/Makefile
+	tests/regression/ust/before-after/Makefile
+	tests/regression/ust/multi-session/Makefile
+	tests/regression/ust/overlap/Makefile
+	tests/regression/ust/overlap/demo/Makefile
+	tests/unit/Makefile
+	tests/utils/Makefile
+	tests/utils/tap/Makefile
 ])
 
 AC_OUTPUT