X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=74fb795db41e9cc8b9d35e5176df95595c03b1fb;hb=fa1c6efebd3d85a4162ddb8e5dd8e1ab3dcdaa53;hp=dc30060fcdeaaceedbcd435ab4c29efb70e6f135;hpb=36385b6ec421b3e752ce1eaad3bcb6776f5536dd;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index dc30060f..74fb795d 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], [1.9.0], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[1.9.0],[mathieu dot desnoyers at efficios dot com])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -11,19 +11,25 @@ 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.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
+LT_INIT
 
 ## Checks for libraries.
 AC_CHECK_LIB([dl], [dlopen])
@@ -65,25 +71,21 @@ AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urc
 This error can also occur when the liburcu package's configure script has not been run.])])
 
 AC_MSG_CHECKING([caa_likely()])
-AC_TRY_COMPILE(
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <urcu/compiler.h>
-],
-[
+]], [[
 void fct(void)
 {
 	if (caa_likely(1)) {
 	}
 }
-],
-[
+]])],[
 	AC_MSG_RESULT([yes])
-],
-[
+],[
 	AC_MSG_RESULT([no])
 	AC_MSG_ERROR([Please upgrade your version of liburcu to 0.6.6 or better])
-]
-)
+
+])
 
 # urcu - check that URCU lib is available to compilation
 AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
@@ -140,23 +142,19 @@ AC_MSG_RESULT($LIBFORMAT)
 
 if test "x$host_cpu" = "xarm" ; then
 AC_MSG_CHECKING([checking for armv5])
-AC_TRY_COMPILE(
-[
-],
-[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+]], [[
 #ifndef __ARM_ARCH_5TEJ__
 #error "no arm5 here"
 #endif
-],
-[
+]])],[
 	AC_MSG_RESULT([yes])
 	NO_UNALIGNED_ACCESS=1
-]
-,
-[
+
+],[
 	AC_MSG_RESULT([no])
-]
-)
+
+])
 fi
 if test x$NO_UNALIGNED_ACCESS = x ; then
 AC_DEFINE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
@@ -213,7 +211,7 @@ AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
 AC_CONFIG_FILES([
 	Makefile
 	include/Makefile
-	include/lttng/version.h
+	include/lttng/ust-version.h
 	doc/Makefile
 	doc/man/Makefile
 	doc/info/Makefile
@@ -226,6 +224,8 @@ AC_CONFIG_FILES([
 	liblttng-ust-java/Makefile
 	tests/Makefile
 	tests/hello/Makefile
+	tests/hello.cxx/Makefile
+	tests/demo/Makefile
 	tests/fork/Makefile
 	tests/ust-basic-tracing/Makefile
 	tests/ust-multi-test/Makefile