From 6ae20f706f09cf8dba1fbad4a672ff7226c8d68a Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 20 Jan 2022 16:52:04 +0000 Subject: [PATCH] Properly capture java variables at configure Some Java related variables aren't currently properly captured when running for example: ./configure JAVACFLAGS="-g" The JAVACFLAGS variable will be used during the configure phase but won't be when running make afterwards. This is due to the AX_JAVA_OPTIONS macro which adds non-standard configure switches like '--with-javac-flags' which as a side-effect inhibit the capture of the variable. Remove this macro and use AC_ARG_VAR to capture these variables and bring the Java support in line with C/C++. Change-Id: I9159e34c1c30a10309200bfc8e0fd067000d14ce Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- configure.ac | 8 +++++--- m4/ax_java_options.m4 | 48 ------------------------------------------- 2 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 m4/ax_java_options.m4 diff --git a/configure.ac b/configure.ac index b6254228..7493f62b 100644 --- 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 ## diff --git a/m4/ax_java_options.m4 b/m4/ax_java_options.m4 deleted file mode 100644 index 722d7880..00000000 --- a/m4/ax_java_options.m4 +++ /dev/null @@ -1,48 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_java_options.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_JAVA_OPTIONS -# -# DESCRIPTION -# -# AX_JAVA_OPTIONS adds configure command line options used for Java m4 -# macros. This Macro is optional. -# -# Note: This is part of the set of autoconf M4 macros for Java programs. -# It is VERY IMPORTANT that you download the whole set, some macros depend -# on other. Unfortunately, the autoconf archive does not support the -# concept of set of macros, so I had to break it for submission. The -# general documentation, as well as the sample configure.in, is included -# in the AX_PROG_JAVA macro. -# -# LICENSE -# -# Copyright (c) 2008 Devin Weaver -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 7 - -AU_ALIAS([AC_JAVA_OPTIONS], [AX_JAVA_OPTIONS]) -AC_DEFUN([AX_JAVA_OPTIONS],[ -AC_ARG_WITH(java-prefix, - [ --with-java-prefix=PFX prefix where Java runtime is installed (optional)]) -AC_ARG_WITH(javac-flags, - [ --with-javac-flags=FLAGS flags to pass to the Java compiler (optional)]) -AC_ARG_WITH(java-flags, - [ --with-java-flags=FLAGS flags to pass to the Java VM (optional)]) -JAVAPREFIX=$with_java_prefix -JAVACFLAGS=$with_javac_flags -JAVAFLAGS=$with_java_flags -AC_SUBST(JAVAPREFIX)dnl -AC_SUBST(JAVACFLAGS)dnl -AC_SUBST(JAVAFLAGS)dnl -AC_SUBST(JAVA)dnl -AC_SUBST(JAVAC)dnl -]) -- 2.34.1