X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=72e8cc8363e828f6546ce74d10352303f4bfb0c7;hb=969771a1536069d8f3f05e4836f5ef746d9b9a11;hp=0749ce7ebd6cb9c3fa1fda5fad2a2d8775771743;hpb=340f77635d76ea6800caeca2d71f0432fea0d31a;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 0749ce7e..72e8cc83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.1.0],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.2.2],[mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -12,7 +12,7 @@ AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0])
 
 # This is the library version of liblttng-ust-ctl, used internally by
 # liblttng-ust, lttng-sessiond, and lttng-consumerd.
-AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [1:0:0])
+AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [2:0:0])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
@@ -39,8 +39,8 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [UST major version number])
 AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number])
 AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel version number])
 
-version_name="Basse Messe"
-version_description="Light coloured German ale whose style was named after the city Cologne (Koln) where it was first brewed. It is a rather simple beer with lightly fruity aromas and a delicate hoppy fragrance. The beer has a pronounced malty taste with a subtle bitter aftertaste"
+version_name="Cuda"
+version_description="Brewed at the Benelux microbrewery, this IPA has huge floral, citric and resinous hop aroma, simply an amazing nose. The flavor is very fresh with a light caramel malting touch completing a strong body. Huge amounts of hops, lots of grapefruit, lemon and oranges. This is an outstanding IPA!"
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name])
 AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description])
 
@@ -109,27 +109,6 @@ AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"])
 
 AC_CHECK_LIB([pthread], [pthread_create])
 
-# Check for libuuid
-AC_CHECK_LIB([uuid], [uuid_generate],
-[
-	AC_DEFINE_UNQUOTED([LTTNG_UST_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_UST_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_UST_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])
-AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"])
-
 # Checks for header files.
 #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
 
@@ -201,7 +180,8 @@ changequote([,])dnl
 	s390) NO_UNALIGNED_ACCESS=1 ;;
 	s390x) NO_UNALIGNED_ACCESS=1 ;;
         arm*) NO_UNALIGNED_ACCESS=1 ;;
-	mips*) NO_UNALIGNED_ACCESS=1;;
+	mips*) NO_UNALIGNED_ACCESS=1 ;;
+	tile*) NO_UNALIGNED_ACCESS=1 ;;
 	*) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;;
 esac
 
@@ -268,23 +248,6 @@ AS_IF([test "x$with_sdt" = "xyes"],[
 	])
 ])
 
-#currently disabled.
-	#tests/hello2/Makefile
-	#tests/basic/Makefile
-	#tests/simple_include/Makefile
-	#tests/snprintf/Makefile
-	#tests/test-nevents/Makefile
-	#tests/test-libustinstr-malloc/Makefile
-	#tests/dlopen/Makefile
-	#tests/same_line_marker/Makefile
-	#tests/trace_event/Makefile
-	#tests/tracepoint/Makefile
-	#tests/tracepoint/benchmark/Makefile
-	#tests/register_test/Makefile
-	#tests/libustctl_function_#tests/Makefile
-	#tests/exit-fast/Makefile
-	#tests/basic_long/Makefile
-
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
@@ -299,16 +262,13 @@ AC_CONFIG_FILES([
 	liblttng-ust-fork/Makefile
 	liblttng-ust-java/Makefile
 	liblttng-ust-libc-wrapper/Makefile
+	liblttng-ust-cyg-profile/Makefile
 	tools/Makefile
 	tests/Makefile
 	tests/hello/Makefile
-	tests/hello-static-lib/Makefile
 	tests/hello.cxx/Makefile
-	tests/daemon/Makefile
-	tests/demo/Makefile
-	tests/fork/Makefile
-	tests/ust-basic-tracing/Makefile
-	tests/ust-multi-test/Makefile
+	tests/same_line_tracepoint/Makefile
+	tests/snprintf/Makefile
 	lttng-ust.pc
 ])