More compile fixes

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3018d8d9bbfc1ba30d40b1344b1aeba4a43b1e6e..d3cac78f9954b23a1af7353abd9197a8909ef5d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,23 +1,28 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([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
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AC_CONFIG_SRCDIR([include/ust/tracepoint.h])
-AC_CONFIG_HEADERS([config.h include/ust/config.h])
+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.
@@ -29,6 +34,11 @@ AC_PROG_LIBTOOL
 AC_CHECK_LIB([dl], [dlopen])
 AC_CHECK_LIB([pthread], [pthread_create])
 
+# Check for libuuid
+AC_CHECK_LIB([uuid], [uuid_generate], [],
+       [AC_MSG_ERROR([Cannot find libuuid. Use [LDFLAGS]=-Ldir to specify its location.])]
+)
+
 # Checks for header files.
 #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
 
@@ -59,6 +69,27 @@ CFLAGS="-Wall $CFLAGS"
 AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CFLAGS]=-Idir to specify their location.
 This error can also occur when the liburcu package's configure script has not been run.])])
 
+AC_MSG_CHECKING([caa_likely()])
+AC_TRY_COMPILE(
+[
+#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.])])
 
@@ -166,40 +197,44 @@ 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/ust-version.h
        doc/Makefile
        doc/man/Makefile
        doc/info/Makefile
-       include/Makefile
-       liblttng-ust-comm/Makefile
+       snprintf/Makefile
        libringbuffer/Makefile
-       libust/Makefile
+       liblttng-ust-comm/Makefile
+       liblttng-ust/Makefile
+       liblttng-ust-ctl/Makefile
+       liblttng-ust-fork/Makefile
+       liblttng-ust-java/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
-       libustinstr-malloc/Makefile
-       libustfork/Makefile
-       snprintf/Makefile
-       ust.pc
-       include/ust/version.h
-       libustjava/Makefile
+       lttng-ust.pc
 ])
 AC_OUTPUT