Properly capture java variables at configure

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 86b1d052393846c8a7da13df2b5e1630cd602b09..7493f62be6a2541b2cce29ad830d4d925c36a36d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -319,6 +319,11 @@ PKG_CHECK_MODULES([URCU], [liburcu >= 0.12])
 # Additional variables captured during ./configure
 
 AC_ARG_VAR([CLASSPATH], [Java class path])
+AC_ARG_VAR([JAVACFLAGS], [Java compiler flags])
+AC_ARG_VAR([JAVAC], [Java compiler])
+AC_ARG_VAR([JAVAFLAGS], [Java VM flags])
+AC_ARG_VAR([JAVA], [Java VM])
+AC_ARG_VAR([JAVAPREFIX], [prefix where Java runtime is installed])
 
 
 ##                              ##
@@ -380,9 +385,6 @@ AS_HELP_STRING([--with-lttng-system-rundir], [Location of the system directory w
   lttng_system_rundir="/var/run/lttng"
 ])
 
-# Add the java command line arguments like '--wit-java-prefix'
-AX_JAVA_OPTIONS
-
 
 ##                                          ##
 ## Check for conflicting features selection ##
@@ -404,7 +406,9 @@ AE_IF_FEATURE_ENABLED([java-agent-all], [
 
 # The numa integration requires libnuma
 AE_IF_FEATURE_ENABLED([numa], [
-  AC_CHECK_LIB([numa], [numa_available], [], [
+  AC_CHECK_LIB([numa], [numa_available], [
+    AC_DEFINE([HAVE_LIBNUMA], [1], [Define to 1 if libnuma is available.])
+  ], [
     AC_MSG_ERROR([dnl
 libnuma is not available. Please either install it (e.g. libnuma-dev) or use
 [LDFLAGS]=-Ldir to specify the right location, or use --disable-numa configure