Fix: build jni libs with openjdk >= 10

[lttng-ust.git] / liblttng-ust-java-agent / java / lttng-ust-agent-common / Makefile.am

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
index 26b2ef25ca67b12ce87633b986d6b14cc4d86c1c..ed551eb4bd6ecefa0dce4acb077b24e7ae65e1d0 100644 (file)
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
@@ -50,11 +50,17 @@ classes = $(pkgpath)/*.class \
 $(jarfile): classnoinst.stamp
        $(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)
 
+if !HAVE_JAVAH
+# If we don't have javah, assume we are running openjdk >= 10 and use javac
+# to generate the jni header file.
+AM_JAVACFLAGS = -h $(jnioutdir)
+else
 context-jni-header.stamp: $(dist_noinst_JAVA)
        $(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(jnioutdir) $(JAVAHFLAGS) org.lttng.ust.agent.context.LttngContextApi && \
        echo "Context API JNI header generated" > context-jni-header.stamp
 
 all-local: context-jni-header.stamp
+endif
 
 install-data-hook:
        cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)