Fix: python agent: 'time' has no attribute 'clock'

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e07888c093fd38beda92477bc45ef051766eac39..243762ced438bf52c25918c116a6811e3c7b42be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@ dnl Version infos
 m4_define([V_MAJOR], [2])
 m4_define([V_MINOR], [12])
 m4_define([V_PATCH], [0])
-m4_define([V_EXTRA], [pre])
-m4_define([V_NAME], [[Codename TBD]])
-m4_define([V_DESC], [[Description TBD]])
+m4_define([V_EXTRA], [rc1])
+m4_define([V_NAME], [[(Ta) Meilleure]])
+m4_define([V_DESC], [[Ta Meilleure is a Northeast IPA beer brewed by Lagabière. Translating to "Your best one", this beer gives out strong aromas of passion fruit, lemon, and peaches. Tastewise, expect a lot of fruit, a creamy texture, and a smooth lingering hop bitterness.]])
 
 m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
 m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])])
@@ -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
@@ -563,6 +576,7 @@ AC_CONFIG_FILES([
 AC_CONFIG_LINKS([
        python-lttngust/lttngust/agent.py:python-lttngust/lttngust/agent.py
        python-lttngust/lttngust/cmd.py:python-lttngust/lttngust/cmd.py
+       python-lttngust/lttngust/compat.py:python-lttngust/lttngust/compat.py
        python-lttngust/lttngust/debug.py:python-lttngust/lttngust/debug.py
        python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py
 ])