X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=3e0b9b137e51161647a4fe04cf5cb163d0f97a6d;hb=b6c0b199b12129b8cde4e1961562ea69e571a8f4;hp=8be1ceb0636d6403dec66a4ae389b30c91584bbd;hpb=528a19119f71805f798c034d6ced6836adc0f0c7;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 8be1ceb0..3e0b9b13 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Version infos m4_define([V_MAJOR], [2]) m4_define([V_MINOR], [10]) -m4_define([V_PATCH], [1]) +m4_define([V_PATCH], [5]) 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.]]) @@ -343,10 +343,10 @@ AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || te CPPFLAGS="$CPPFLAGS $JNI_CPPFLAGS" AX_PROG_JAVAH CPPFLAGS="$saved_CPPFLAGS" - - AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"]) ]) +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])