X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=af66906417b1c2179787b494425c8b9fb89f9ed2;hb=a9e89020a471ce6c27c65d01a24ae3e5cb820534;hp=2440cab61e850d659959942104790104f69a6761;hpb=8b19f008b5e60bc75750934797c6027c35a5bb2d;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 2440cab6..af669064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Version infos
 m4_define([V_MAJOR], [2])
 m4_define([V_MINOR], [10])
-m4_define([V_PATCH], [0])
-m4_define([V_EXTRA], [rc1])
+m4_define([V_PATCH], [7])
+dnl m4_define([V_EXTRA], [])
 m4_define([V_NAME], [[KeKriek]])
 m4_define([V_DESC], [[From Brasserie Dunham, a sour mashed golden wheat ale fermented with local sour cherries from Tougas orchards. Fresh sweet cherry notes with some tartness, lively carbonation with a dry finish.]])
 
@@ -26,7 +26,7 @@ AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0])
 
 # This is the library version of liblttng-ust-ctl, used internally by
 # liblttng-ust, lttng-sessiond, and lttng-consumerd.
-AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [3:0:1])
+AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [4:0:0])
 
 AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -345,6 +345,8 @@ AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || te
 	CPPFLAGS="$saved_CPPFLAGS"
 ])
 
+AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"])
+
 AS_IF([test "x$java_agent_log4j" = "xyes"], [
 	AX_CHECK_CLASSPATH
 	AX_CHECK_CLASS([org.apache.log4j.Logger])
@@ -463,8 +465,6 @@ AC_DEFUN([_AC_DEFINE_AND_SUBST], [
 ])
 
 _AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
-# By default, do not retry on buffer full condition.
-_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_BLOCKING_RETRY_TIMEOUT_MS], [0])
 
 AM_CFLAGS="-Wall"
 AC_SUBST(AM_CFLAGS)
@@ -514,6 +514,7 @@ AC_CONFIG_FILES([
 	tests/utils/Makefile
 	tests/test-app-ctx/Makefile
 	tests/gcc-weak-hidden/Makefile
+	tests/libringbuffer/Makefile
 	lttng-ust.pc
 ])