Rename ltt_events_exit to lttng_ust_events_exit

[ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index dbfdecdecaaf4f5ee3d4219ffc0200d175b975e8..856894b2ca166c6f1e591179acc0d3258b82646d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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,11 +122,12 @@ changequote([,])dnl
        x86_64) LIBFORMAT="elf64-x86-64" ;;
        powerpc) LIBFORMAT="elf32-powerpc" ;;
        ppc64) LIBFORMAT="elf64-powerpc" ;;
-       s390) LIBFORMAT="elf32-s390" ;;
-       s390x) LIBFORMAT="elf64-s390" ;;
+       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 ;;
-       arm) LIBFORMAT="elf32-littlearm" ;;
-       mips*) LIBFORMAT="" ;;
+       arm) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
+       mips*) LIBFORMAT=""; NO_UNALIGNED_ACCESS=1;;
        *) AC_MSG_ERROR([unable to detect library format (unsupported architecture ($host_cpu)?)]) ;;
 esac
 AC_SUBST(LIBFORMAT)
@@ -160,7 +182,7 @@ fi
 if test "$with_jni_interface" = "yes"; then
         AC_CHECK_HEADERS([jni.h],,AC_MSG_ERROR([
 missing jni.h
-Make sure Sun Java, OpenJDK or GCJ is installed and that this header file exists in the system path.
+Make sure Sun Java or OpenJDK or GCJ is installed and that this header file exists in the system path.
 Use --with-java-jdk=DIR flag to point to your java include files or desactivate the JNI interface.]))
 fi
 AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
@@ -174,8 +196,11 @@ AC_CONFIG_FILES([
        liblttng-ust-comm/Makefile
        libringbuffer/Makefile
        libust/Makefile
+       libustctl/Makefile
        tests/Makefile
        tests/hello/Makefile
+       tests/ust-basic-tracing/Makefile
+       tests/ust-multi-test/Makefile
        tests/hello2/Makefile
        tests/basic/Makefile
        tests/basic_long/Makefile
@@ -197,6 +222,6 @@ AC_CONFIG_FILES([
        snprintf/Makefile
        ust.pc
        include/ust/version.h
-       java/Makefile
+       libustjava/Makefile
 ])
 AC_OUTPUT