Fix doxygen testing for jdk < 9

Examples/Makefile.in

@@ -630,7 +630,6 @@ java_run:
 java_version:
 	$(JAVA) -version
 	$(JAVAC) -version || echo "Unknown javac version"
-	echo "JAVA_HOME=\"$(JAVA_HOME)\""
 
 # -----------------------------------------------------------------
 # Cleaning the java examples

Examples/test-suite/java/Makefile.in

@@ -7,10 +7,9 @@ JAVA         = @JAVA@
 JAVAC        = @JAVAC@
 JAVAFLAGS    = @JAVAFLAGS@
 JAVA_CLASSPATH_SEP = @JAVA_CLASSPATH_SEP@
+JAVA_TOOLS_JAR     = @JAVA_TOOLS_JAR@
 SCRIPTSUFFIX = _runme.java
 
-JAVA_HOME ?= @JAVA_HOME@
-
 srcdir       = @srcdir@
 top_srcdir   = ../@top_srcdir@
 top_builddir = ../@top_builddir@
@@ -110,7 +109,7 @@ CommentParser.class:
 	$(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): JAVA_CLASSPATH := "$(JAVA_TOOLS_JAR)$(JAVA_CLASSPATH_SEP)."
 $(DOXYGEN_TEST_CASES:=.cpptest): CommentParser.class
 
 # Compiles java files then runs the testcase. A testcase is only run if

configure.ac

@@ -1349,6 +1349,7 @@ if test -z "$JAVAINCDIR" ; then
       if test -r "$d/jni.h" ; then
 	JAVAINCDIR=$d
 	JAVAINC=-I\"$d\"
+	JAVA_HOME_MAYBE="`dirname $d`"
 	break
       fi
     done
@@ -1375,6 +1376,26 @@ else
   fi
 fi
 
+# Auto-detecting JAVA_HOME is not so easy, below will only work up to and including jdk8
+if test -z "$JAVA_HOME" && test -n "$JAVA_HOME_MAYBE" ; then
+  AC_MSG_CHECKING(for java jdk from jni include paths)
+  if test -r "$JAVA_HOME_MAYBE/lib/tools.jar" ; then
+    JAVA_HOME=$JAVA_HOME_MAYBE
+    AC_MSG_RESULT([$JAVA_HOME])
+  else
+    AC_MSG_RESULT(not found)
+  fi
+fi
+
+# Javadoc support required for the Java test-suite is available by default in jdk9+ and in tools.jar in earlier jdk versions
+AC_MSG_CHECKING(for java tools.jar)
+if test -n "$JAVA_HOME" && test -r "$JAVA_HOME/lib/tools.jar" ; then
+  JAVA_TOOLS_JAR="$JAVA_HOME/lib/tools.jar"
+  AC_MSG_RESULT([$JAVA_TOOLS_JAR])
+else
+  AC_MSG_RESULT(not found)
+fi
+
 case $host in
 *-*-cygwin*)
         # TODO: Only use this flag if the compiler supports it, later versions of gcc no longer have it
@@ -1437,11 +1458,11 @@ 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)
 AC_SUBST(JAVA_CLASSPATH_SEP)
+AC_SUBST(JAVA_TOOLS_JAR)
 AC_SUBST(JAVADYNAMICLINKING)
 AC_SUBST(JAVALIBRARYPREFIX)
 AC_SUBST(JAVASO)