X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=067eaaa19ed5e8fe9cc05ef31fdef4e878471fcc;hb=f6d8f8f383c40b07f935f4d1b767907e6374c36a;hp=4fc6f9ca62d9fe39752d59004cfa94d3c9842696;hpb=b2292d8567372f5bbadaeb0cd7b26e6fc4cd1b56;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 4fc6f9ca..067eaaa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 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_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.]])
+m4_define([V_MINOR], [11])
+m4_define([V_PATCH], [2])
+dnl m4_define([V_EXTRA], [])
+m4_define([V_NAME], [[Lafontaine]])
+m4_define([V_DESC], [[A modern Saison beer from Montréal's Oshlag microbrewery, Lafontaine is a refreshing, zesty, rice beer with hints of fruit and spices.]])
 
 m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
 m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])])
@@ -373,6 +373,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])