More compile fixes

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 391cc9ac5de1b886b5f8512cfe3e65131a28b642..d3cac78f9954b23a1af7353abd9197a8909ef5d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,13 +11,18 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
 AC_CONFIG_HEADERS([config.h include/lttng/config.h])
 AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
-# Compute minor/major version numbers
-major_version=`echo AC_PACKAGE_VERSION | sed 's/\..*//'`
-minor_version=`echo AC_PACKAGE_VERSION | sed 's/.*\.//' | sed 's/^0//'`
+
+# 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/')
 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])
 
 
 # Checks for programs.
@@ -192,10 +197,28 @@ Use --with-java-jdk=DIR flag to point to your java include files or desactivate
 fi
 AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
 
+#currently disabled.
+       #liblttng-ust-malloc/Makefile
+       #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
        include/Makefile
-       include/lttng/version.h
+       include/lttng/ust-version.h
        doc/Makefile
        doc/man/Makefile
        doc/info/Makefile
@@ -206,27 +229,12 @@ AC_CONFIG_FILES([
        liblttng-ust-ctl/Makefile
        liblttng-ust-fork/Makefile
        liblttng-ust-java/Makefile
-       liblttng-ust-malloc/Makefile
        tests/Makefile
        tests/hello/Makefile
+       tests/demo/Makefile
+       tests/fork/Makefile
        tests/ust-basic-tracing/Makefile
        tests/ust-multi-test/Makefile
-       tests/hello2/Makefile
-       tests/basic/Makefile
-       tests/basic_long/Makefile
-       tests/fork/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
        lttng-ust.pc
 ])
 AC_OUTPUT