X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=e54cfea2d1e1b99a331d81c5a01081e7e6031d46;hb=8824f307f850d8da51304415cf95570c5e983abc;hp=a08643ee7c11bba1138fb05a3a4cb2d51b51fe35;hpb=b96787d23b84a303d49058c68c382c43b6b53625;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index a08643ee..e54cfea2 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.0-rc1],[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])
 
@@ -248,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
@@ -285,10 +268,8 @@ AC_CONFIG_FILES([
 	tests/hello/Makefile
 	tests/hello-static-lib/Makefile
 	tests/hello.cxx/Makefile
-	tests/daemon/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
 ])