Fix: build jni libs with openjdk >= 10

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b0b415729e23a6bef5c4ee48310c4b69c08c3d5e..a762b8c81cc3932b0c355ed68b40e02026252ba5 100644 (file)
--- 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.
 
@@ -370,6 +371,8 @@ 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"])
 ])
 
 AS_IF([test "x$java_agent_log4j" = "xyes"], [