X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=2ed7f5d8ee3ba9d096affe106eacdd1b367d3132;hb=79f7b13112003c1af84404fa248c6bd22a910f21;hp=391cc9ac5de1b886b5f8512cfe3e65131a28b642;hpb=2cb765947efd2537aa896d1e82989679b5cc212a;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 391cc9ac..2ed7f5d8 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])
@@ -58,6 +64,13 @@ AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
 
 CFLAGS="-Wall $CFLAGS"
 
+# Check for texinfo, required for building the documentation
+# TODO: make this (and building the documentation) optional
+AC_CHECK_PROG([TEXINFO], [makeinfo], [yes])
+AS_IF([test "x$TEXINFO" != "xyes"],[
+	AC_MSG_ERROR([Please install the 'texinfo' program and make sure 'makeinfo' is in the PATH.])
+])
+
 # URCU
 
 # urcu - check if we just find the headers it out of the box.
@@ -65,25 +78,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 +149,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])
@@ -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,13 @@ 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/hello.cxx/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