X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=7f12f23ff5f5cbb2873e282dd7c097a3e8920c08;hb=59034aabb2f237e81a92d772e2d56e52eb14f1af;hp=79c33ff395896101319c4961e5d975f60c747d7e;hpb=faebb41808b9deda5ef5dfea0c035077407e7f9f;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 79c33ff3..7f12f23f 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.0.1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.1.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
@@ -34,8 +34,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="Annedd'ale"
-version_description="New type of beer, 100% from Quebec, flavored with sapin beaumier needles, with a touch of hops."
+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"
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name])
 AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description])
 
@@ -64,6 +64,8 @@ AS_IF([test "x$libtool_fixup" = "xyes"],
 		  ])
 	    ])
 
+AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"])
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
@@ -330,6 +332,7 @@ AC_CONFIG_FILES([
 	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