From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 23 Mar 2021 16:54:41 +0000 (-0400)
Subject: fix: java detection is optional
X-Git-Tag: v2.13.0-rc1~210
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=875cae805decd6b6ea9050d03ec732235596fdf7;p=lttng-ust.git

fix: java detection is optional

I misunderstood the dependencies between the different java macros, move
the binairies detection back to optionnal for the time being.

Change-Id: I917f8f5dc7c34f1ac360d405b3a2327e2ee518e7
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/configure.ac b/configure.ac
index 4ecd250f..09ba4ed0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,10 +186,6 @@ AC_CHECK_PROGS([XMLTO], [xmlto])
 
 AM_PATH_PYTHON([2.7], [], [PYTHON=""])
 
-AX_PROG_JAVAC
-AX_PROG_JAVA
-AX_PROG_JAR
-
 # Initialize and configure libtool
 LT_INIT([disable-static])
 
@@ -361,8 +357,9 @@ argument to disable NUMA support.
 
 # The JNI interface and Java Agents require a working Java JDK
 AS_IF([AE_IS_FEATURE_ENABLED([jni-interface]) || AE_IS_FEATURE_ENABLED([java-agent-jul]) || AE_IS_FEATURE_ENABLED([java-agent-log4j])], [
-  # We detected a java compiler earlier, make sure it works
-  AX_PROG_JAVAC_WORKS
+  AX_PROG_JAVAC
+  AX_PROG_JAVA
+  AX_PROG_JAR
 
   # Get the CPPFLAGS required to build jni libaries
   AX_JNI_INCLUDE_DIR