X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=f337afc349123f78bcca913bea2b9eac95be5e60;hb=60b488d313c3128b0214ec3ed331603c022e37ba;hp=b0b415729e23a6bef5c4ee48310c4b69c08c3d5e;hpb=23e08412a688ed2f8cdf7c7776ecbedf6c860875;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index b0b41572..f337afc3 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,7 @@ m4_define([UST_LIB_V_MINOR], [0]) m4_define([UST_LIB_V_PATCH], [0]) AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [UST_LIB_V_MAJOR:UST_LIB_V_MINOR:UST_LIB_V_PATCH]) +AC_SUBST([LTTNG_UST_LIBRARY_VERSION_MAJOR], [UST_LIB_V_MAJOR]) # note: remember to update tracepoint.h dlopen() to match this version # number. TODO: eventually automate by exporting the major number. @@ -372,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])