Rename UST.class to LTTNG_UST.class

[ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3018d8d9bbfc1ba30d40b1344b1aeba4a43b1e6e..8968d69666b79b6a3dd06294464dd8cbf2474b3e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,15 @@
 #                                               -*- 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/\..*//'`
@@ -59,6 +59,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.])])
 
@@ -168,13 +189,19 @@ AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
 
 AC_CONFIG_FILES([
        Makefile
+       include/Makefile
+       include/lttng/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
+       liblttng-ust-malloc/Makefile
        tests/Makefile
        tests/hello/Makefile
        tests/ust-basic-tracing/Makefile
@@ -195,11 +222,6 @@ AC_CONFIG_FILES([
        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
 ])
 AC_OUTPUT