From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 3 May 2018 19:58:44 +0000 (-0400)
Subject: Fix: AM_CONDITIONAL should be outside AS_IF block
X-Git-Tag: v2.11.0-rc1~13
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1f0418c7cd7e109bb74cbe8e8e5058758779a247;p=lttng-ust.git

Fix: AM_CONDITIONAL should be outside AS_IF block

Fixes:

configure: error: conditional "HAVE_JAVAH" was never defined.
Usually this means the macro was only invoked conditionally

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/configure.ac b/configure.ac
index a762b8c8..f337afc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,10 +371,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])