configure.ac: do not use shell eval for known values

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cd92e1928ef9574a08b161cf1c707428b2c265a3..9f238774304e550f6afb2d3934135c07aaded32e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,14 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.8.0-pre],[mathieu dot desnoyers at efficios dot com])
+m4_define([V_MAJOR], [2])
+m4_define([V_MINOR], [8])
+m4_define([V_PATCH], [0])
+m4_define([V_EXTRA], [pre])
+m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
+m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])])
+
+AC_INIT([lttng-ust],V_STRING,[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
@@ -29,17 +36,11 @@ AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligne
 AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h])
 AH_TEMPLATE([LTTNG_UST_HAVE_PERF_EVENT], [Perf event integration via perf_event.h])
 
-# Compute minor/major/patchlevel version numbers
+# Substitute 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/')
-AC_SUBST([MAJOR_VERSION], [$major_version])
-AC_SUBST([MINOR_VERSION], [$minor_version])
-AC_SUBST([PATCHLEVEL_VERSION], [$patchlevel_version])
-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])
+AC_SUBST([MAJOR_VERSION], [V_MAJOR])
+AC_SUBST([MINOR_VERSION], [V_MINOR])
+AC_SUBST([PATCHLEVEL_VERSION], [V_PATCH])
 
 version_name="Herbe à Détourne"
 version_description='Brewed with unrestrained amounts of Citra hop, the Herbe à Détourne is a fantastic New World Tripel brewed by "Dieu du Ciel!". Aromas of mango, cantaloupe melon and passion fruit, combined with a controlled bitter finish, unite in making this smooth golden-orange beer stand apart.'
@@ -389,15 +390,18 @@ AC_CONFIG_FILES([
        liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
        liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
        liblttng-ust-java-agent/jni/Makefile
+       liblttng-ust-java-agent/jni/common/Makefile
        liblttng-ust-java-agent/jni/jul/Makefile
        liblttng-ust-java-agent/jni/log4j/Makefile
        liblttng-ust-libc-wrapper/Makefile
        liblttng-ust-cyg-profile/Makefile
        liblttng-ust-python-agent/Makefile
-       liblttng-ust-python-agent/setup.py
-       liblttng-ust-python-agent/lttngust/__init__.py
+       python-lttngust/Makefile
+       python-lttngust/setup.py
+       python-lttngust/lttngust/__init__.py
        tools/Makefile
        tests/Makefile
+       tests/ctf-types/Makefile
        tests/hello/Makefile
        tests/hello.cxx/Makefile
        tests/same_line_tracepoint/Makefile
@@ -405,15 +409,16 @@ AC_CONFIG_FILES([
        tests/ust-elf/Makefile
        tests/benchmark/Makefile
        tests/utils/Makefile
+       tests/test-app-ctx/Makefile
        lttng-ust.pc
 ])
 
 # Create link for python agent for the VPATH guru.
 AC_CONFIG_LINKS([
-       liblttng-ust-python-agent/lttngust/agent.py:liblttng-ust-python-agent/lttngust/agent.py
-       liblttng-ust-python-agent/lttngust/cmd.py:liblttng-ust-python-agent/lttngust/cmd.py
-       liblttng-ust-python-agent/lttngust/debug.py:liblttng-ust-python-agent/lttngust/debug.py
-       liblttng-ust-python-agent/lttngust/loghandler.py:liblttng-ust-python-agent/lttngust/loghandler.py
+       python-lttngust/lttngust/agent.py:python-lttngust/lttngust/agent.py
+       python-lttngust/lttngust/cmd.py:python-lttngust/lttngust/cmd.py
+       python-lttngust/lttngust/debug.py:python-lttngust/lttngust/debug.py
+       python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py
 ])
 
 AC_OUTPUT