From 04a5215665f0320271f6c969678d5818aee48b68 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 12 Dec 2016 22:28:57 +0100 Subject: [PATCH] Fix using com.sun.tools.javadoc package under macOS Export JAVA_HOME found by configure, so that the Java test suite makefile could find this package under this directory. --- Examples/test-suite/java/Makefile.in | 4 +++- configure.ac | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index 986c230cc..ee6011ff8 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -6,9 +6,11 @@ LANGUAGE = java JAVA = @JAVA@ JAVAC = @JAVAC@ JAVAFLAGS = @JAVAFLAGS@ -JAVA_CLASSPATH_SEP := @JAVA_CLASSPATH_SEP@ +JAVA_CLASSPATH_SEP = @JAVA_CLASSPATH_SEP@ SCRIPTSUFFIX = _runme.java +JAVA_HOME ?= @JAVA_HOME@ + srcdir = @srcdir@ top_srcdir = ../@top_srcdir@ top_builddir = ../@top_builddir@ diff --git a/configure.ac b/configure.ac index 7313dbd3f..7b9e8433a 100644 --- a/configure.ac +++ b/configure.ac @@ -1391,6 +1391,7 @@ fi # Turned off due to spurious warnings in later versions of openjdk-1.8 # JAVAFLAGS=-Xcheck:jni +AC_SUBST(JAVA_HOME) AC_SUBST(JAVA) AC_SUBST(JAVAC) AC_SUBST(JAVAINC)