Standardize version across toolchain

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d04f4322deb5d5800645ad358f18e853ce9d919a..693cb1852a4a99576a7c89bb79e10b037c52c59a 100644 (file)
--- 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],[1.9.7],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.0.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
@@ -24,9 +24,9 @@ AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h])
 
 # Compute minor/major/patchlevel version numbers
 AC_PROG_SED
-major_version=$(echo AC_PACKAGE_VERSION | sed 's/^\([[0-9]]\)*\.[[0-9]]*\.[[0-9]]*$/\1/')
-minor_version=$(echo AC_PACKAGE_VERSION | sed 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*$/\1/')
-patchlevel_version=$(echo AC_PACKAGE_VERSION | sed 's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)$/\1/')
+major_version=$(echo AC_PACKAGE_VERSION | sed 's/^\([[0-9]]\)*\.[[0-9]]*\.[[0-9]]*.*$/\1/')
+minor_version=$(echo AC_PACKAGE_VERSION | sed 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*.*$/\1/')
+patchlevel_version=$(echo AC_PACKAGE_VERSION | sed 's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\).*$/\1/')
 AC_SUBST([MAJOR_VERSION], [$major_version])
 AC_SUBST([MINOR_VERSION], [$minor_version])
 AC_SUBST([PATCHLEVEL_VERSION], [$patchlevel_version])
@@ -253,6 +253,8 @@ AS_IF([test "x$with_sdt" = "xyes"],[
 
 AC_CONFIG_FILES([
        Makefile
+       doc/Makefile
+       doc/examples/Makefile
        include/Makefile
        include/lttng/ust-version.h
        snprintf/Makefile
@@ -263,6 +265,7 @@ AC_CONFIG_FILES([
        liblttng-ust-fork/Makefile
        liblttng-ust-java/Makefile
        liblttng-ust-libc-wrapper/Makefile
+       tools/Makefile
        tests/Makefile
        tests/hello/Makefile
        tests/hello-static-lib/Makefile