Add compile time assertion that array and sequence have integer elements

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bfada519c7b8aa6f2b14d6abc6c0e738f2ad8924..eb1bb3e6b52a51bdaf878dafe73e3af395e8b9c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,7 @@ AC_SYS_LARGEFILE
 AC_PROG_CC
 AC_PROG_CC_STDC
 AC_PROG_CXX
+AX_CXX_COMPILE_STDCXX([11])
 RW_PROG_CXX_WORKS
 AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
 
@@ -249,6 +250,17 @@ AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xye
 
 # URCU
 
+AC_MSG_CHECKING([DEFINE_URCU_TLS_INIT()])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+       #include <urcu/tls-compat.h>
+       DEFINE_URCU_TLS_INIT(int, a, 1);
+]])], [
+       AC_MSG_RESULT([yes])
+], [
+       AC_MSG_RESULT([no])
+       AC_MSG_ERROR([Please upgrade your version of liburcu to 0.12.0 or better])
+])
+
 # urcu - check if we just find the headers it out of the box.
 AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CPPFLAGS]=-Idir to specify their location.
 This error can also occur when the liburcu package's configure script has not been run.])])
@@ -359,6 +371,7 @@ AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || te
        AX_PROG_JAVAC
        AX_PROG_JAVA
        AX_PROG_JAR
+       AC_ARG_VAR([CLASSPATH], [Java class path])
 
        AX_JNI_INCLUDE_DIR
        for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS