From 7373b99079557569202a88a1c3dad8083d2f1113 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 8 Jun 2018 19:12:39 +0100
Subject: [PATCH] JAVA_HOME nad tools.jar not needed for Java testing

tools.jar doesn't seem to be needed (in jdk9 anyway), so removing it.
---
 Doc/Manual/Doxygen.html              | 4 +---
 Examples/test-suite/java/Makefile.in | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Doc/Manual/Doxygen.html b/Doc/Manual/Doxygen.html
index 1e9bbb977..3495684c8 100644
--- a/Doc/Manual/Doxygen.html
+++ b/Doc/Manual/Doxygen.html
@@ -1714,9 +1714,7 @@ tool, for example:
 
     
 <p>
-Runtime tests in Java are implemented using Javadoc doclets. To make that work, you
-should have tools.jar from the JDK in your classpath. Or you should have JAVA_HOME
-environment variable defined and pointing to the JDK location.
+Runtime tests in Java are implemented using Javadoc doclets in tools.jar in the JDK.
 </p>
 <p>
 The Java's comment parsing code (the testing part) is located in commentParser.java.
diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in
index 3ce692080..5af68ec4f 100644
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@@ -6,10 +6,8 @@ LANGUAGE     = java
 JAVA         = @JAVA@
 JAVAC        = @JAVAC@
 JAVAFLAGS    = @JAVAFLAGS@
-JAVA_CLASSPATH_SEP = @JAVA_CLASSPATH_SEP@
 SCRIPTSUFFIX = _runme.java
-
-JAVA_HOME ?= @JAVA_HOME@
+JAVA_CLASSPATH = .
 
 srcdir       = @srcdir@
 top_srcdir   = ../@top_srcdir@
@@ -110,8 +108,6 @@ CommentParser.class:
 	echo "Compiling $(srcdir)/CommentParser.java"
 	$(COMPILETOOL) $(JAVAC) -classpath $(JAVA_CLASSPATH) -d . $(srcdir)/CommentParser.java
 
-JAVA_CLASSPATH := .
-$(DOXYGEN_TEST_CASES:=.cpptest): JAVA_CLASSPATH := "$(JAVA_HOME)/lib/tools.jar$(JAVA_CLASSPATH_SEP)."
 $(DOXYGEN_TEST_CASES:=.cpptest): CommentParser.class
 
 # Compiles java files then runs the testcase. A testcase is only run if