X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=48330b09252a41d416887fdc558033c9423159ad;hb=58bd2e41b5ecaa67101c5472d959ffba980e12b1;hp=e2acfa9057bbd20a0cefcb104c047021ab5bd10d;hpb=9050321d9d15e530dcb6baf539b53023cf114247;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index e2acfa90..48330b09 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], [6])
+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.]])
 
@@ -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])