Move include/ust/ to include/lttng/

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a8ec60a183a7deeb5ea1e5c1b75b705436a45378..be93880c987813122ffef888d9eb00a293af05d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,8 @@ 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.])])
 
@@ -101,6 +122,7 @@ changequote([,])dnl
        x86_64) LIBFORMAT="elf64-x86-64" ;;
        powerpc) LIBFORMAT="elf32-powerpc" ;;
        ppc64) LIBFORMAT="elf64-powerpc" ;;
+       powerpc64) LIBFORMAT="elf64-powerpc" ;;
        s390) LIBFORMAT="elf32-s390"; NO_UNALIGNED_ACCESS=1 ;;
        s390x) LIBFORMAT="elf64-s390"; NO_UNALIGNED_ACCESS=1 ;;
         armv5) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
@@ -174,6 +196,7 @@ AC_CONFIG_FILES([
        liblttng-ust-comm/Makefile
        libringbuffer/Makefile
        libust/Makefile
+       libustctl/Makefile
        tests/Makefile
        tests/hello/Makefile
        tests/ust-basic-tracing/Makefile
@@ -198,7 +221,7 @@ AC_CONFIG_FILES([
        libustfork/Makefile
        snprintf/Makefile
        ust.pc
-       include/ust/version.h
+       include/lttng/version.h
        libustjava/Makefile
 ])
 AC_OUTPUT