Fix: reactivate --with-java_target and made java compatible to java 6 (…

…MDSplus#1794) * Build: honor --with-java_target by appending JAVAVERSION to JAVACFLAGS * Build: cannot build javas mdsplus-api and jtraverser2 other than java 8 * Build: moved rt.jar into ./java/ * Build: Makefile.inc.in only set JAVACFLAGS if not provided by calling Makefile - fixes java8 for mdsplu-api/tests * Build: cannot build jscope with java 6
sjleefg02 · Sep 16, 2019 · 73951ce · 73951ce
1 parent 6e1e594
commit 73951ce
Show file tree

Hide file tree

Showing 47 changed files with 13 additions and 50 deletions.
diff --git a/LabView/Makefile.in b/LabView/Makefile.in
@@ -286,7 +286,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/Makefile.inc.in b/Makefile.inc.in
@@ -20,7 +20,7 @@ GROFF = @GROFF@
 INSTALL = @INSTALL@
 JAR = @JAR@
 JAVAC = @JAVAC@
-JAVACFLAGS = @JAVACFLAGS@
+JAVACFLAGS ?= @JAVACFLAGS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@

diff --git a/configure b/configure
@@ -868,7 +868,6 @@ GLOBUSLICENSE_TRUE
 RMIC
 JAR
 JAVAC
-JAVAVERSION
 READLINK
 JAVAC_PATH_NAME
 ENABLE_JAVA_FALSE
@@ -8081,11 +8080,9 @@ fi
 # Check whether --with-java_bootclasspath was given.
 if test "${with_java_bootclasspath+set}" = set; then :
   withval=$with_java_bootclasspath; as_fn_append JAVAVERSION " -bootclasspath $withval"
-else
-  as_fn_append JAVAVERSION
 fi
 
-
+as_fn_append JAVACFLAGS " ${JAVAVERSION}"
 
 case $enable_java in #(
   yes) :

diff --git a/configure.ac b/configure.ac
@@ -224,8 +224,8 @@ AC_ARG_WITH([java_bootclasspath],
 	    [AS_HELP_STRING([--with-java_bootclasspath=bootclasspath],
                             [specify the bootclasspath option for use with --with-java_target (i.e. /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/rt.jar)])],
             [AS_VAR_APPEND([JAVAVERSION], [" -bootclasspath $withval"])],
-            [AS_VAR_APPEND([JAVAVERSION], [])])
-AC_SUBST([JAVAVERSION])
+            [])
+AS_VAR_APPEND([JAVACFLAGS],[" ${JAVAVERSION}"])
 
 AS_CASE([$enable_java],
         [yes], [AC_MSG_CHECKING([for presence of Java Development Kit])

diff --git a/deploy/platform/platform_docker_build.sh b/deploy/platform/platform_docker_build.sh
@@ -160,7 +160,7 @@ make_jars() {
   rm -Rf /workspace/jars
   mkdir -p /workspace/jars
   pushd /workspace/jars
-  ${srcdir}/configure --enable-java_only --with-java_target=6 --with-java_bootclasspath=${srcdir}/rt.jar
+  ${srcdir}/configure --enable-java_only --with-java_target=6 --with-java_bootclasspath=${srcdir}/java/rt.jar
   if [ -z "$NOMAKE" ]; then
     $MAKE
   fi

diff --git a/docs/Makefile.in b/docs/Makefile.in
@@ -288,7 +288,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/dwscope/Makefile.in b/dwscope/Makefile.in
@@ -347,7 +347,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/Makefile.in b/java/Makefile.in
@@ -255,7 +255,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/jdevices/Makefile.in b/java/jdevices/Makefile.in
@@ -291,7 +291,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/jdispatcher/Makefile.in b/java/jdispatcher/Makefile.in
@@ -294,7 +294,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/jscope/Makefile.am b/java/jscope/Makefile.am
@@ -1,3 +1,4 @@
+JAVACFLAGS = -encoding UTF-8
 JAVAROOT = $(builddir)
 EXTRA_DIST = $(MINDTERM)
 CLEANFILES = $(java_DATA)

diff --git a/java/jscope/Makefile.in b/java/jscope/Makefile.in
@@ -350,9 +350,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAR = @JAR@
 JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
-JAVACFLAGS = @JAVACFLAGS@
+JAVACFLAGS = -encoding UTF-8
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/jtraverser/Makefile.in b/java/jtraverser/Makefile.in
@@ -295,7 +295,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/jtraverser2/Makefile.am b/java/jtraverser2/Makefile.am
@@ -1,3 +1,4 @@
+JAVACFLAGS = -encoding UTF-8
 include ../Makefile.inc.am
 
 java_srcdir = $(srcdir)/src/main/java

diff --git a/java/jtraverser2/Makefile.in b/java/jtraverser2/Makefile.in
@@ -292,9 +292,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAR = @JAR@
 JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
-JAVACFLAGS = @JAVACFLAGS@
+JAVACFLAGS = -encoding UTF-8
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/mdsobjects/Makefile.in b/java/mdsobjects/Makefile.in
@@ -291,7 +291,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/mdsobjects/docs/Makefile.in b/java/mdsobjects/docs/Makefile.in
@@ -289,7 +289,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/mdsplus-api/Makefile.am b/java/mdsplus-api/Makefile.am
@@ -1,3 +1,4 @@
+JAVACFLAGS = -encoding UTF-8
 include ../Makefile.inc.am
 
 JSCH = $(abs_srcdir)/jsch-0.1.54.jar

diff --git a/java/mdsplus-api/Makefile.in b/java/mdsplus-api/Makefile.in
@@ -290,9 +290,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAR = @JAR@
 JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
-JAVACFLAGS = @JAVACFLAGS@
+JAVACFLAGS = -encoding UTF-8
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/mdsplus-api/tests/Makefile.am b/java/mdsplus-api/tests/Makefile.am
@@ -1,3 +1,4 @@
+JAVACFLAGS = -encoding UTF-8
 include ../../Makefile.tests.am
 
 MAIN_JARS = mdsplus-api.jar

diff --git a/java/mdsplus-api/tests/Makefile.in b/java/mdsplus-api/tests/Makefile.in
@@ -482,9 +482,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAR = @JAR@
 JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
-JAVACFLAGS = @JAVACFLAGS@
+JAVACFLAGS = -encoding UTF-8
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/java/mdsplus/Makefile.in b/java/mdsplus/Makefile.in
@@ -291,7 +291,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/rt.jar → java/rt.jar b/rt.jar → java/rt.jar
diff --git a/macosx/Makefile.in b/macosx/Makefile.in
@@ -290,7 +290,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/manpages/Makefile.in b/manpages/Makefile.in
@@ -288,7 +288,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/mdslib/docs/Makefile.in b/mdslib/docs/Makefile.in
@@ -289,7 +289,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/mdslib/testing/Makefile.in b/mdslib/testing/Makefile.in
@@ -517,7 +517,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/mdsobjects/cpp/docs/Makefile.in b/mdsobjects/cpp/docs/Makefile.in
@@ -291,7 +291,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/mdsobjects/cpp/testing/Makefile.in b/mdsobjects/cpp/testing/Makefile.in
@@ -689,7 +689,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/mdsobjects/cpp/testing/testutils/Makefile.in b/mdsobjects/cpp/testing/testutils/Makefile.in
@@ -346,7 +346,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/mdsshr/docs/Makefile.in b/mdsshr/docs/Makefile.in
@@ -289,7 +289,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/mdsshr/testing/Makefile.in b/mdsshr/testing/Makefile.in
@@ -523,7 +523,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/mdstcpip/docs/Makefile.in b/mdstcpip/docs/Makefile.in
@@ -349,7 +349,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/mdstcpip/docs/img/Makefile.in b/mdstcpip/docs/img/Makefile.in
@@ -255,7 +255,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/mdstcpip/zlib/Makefile.in b/mdstcpip/zlib/Makefile.in
@@ -336,7 +336,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/python/MDSplus/docs/Makefile.in b/python/MDSplus/docs/Makefile.in
@@ -289,7 +289,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/python/MDSplus/tests/Makefile.in b/python/MDSplus/tests/Makefile.in
@@ -471,7 +471,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/rpm/Makefile.in b/rpm/Makefile.in
@@ -294,7 +294,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
@@ -289,7 +289,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/setevent/Makefile.in b/setevent/Makefile.in
@@ -297,7 +297,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/tdishr/testing/Makefile.in b/tdishr/testing/Makefile.in
@@ -517,7 +517,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/tditest/testing/Makefile.in b/tditest/testing/Makefile.in
@@ -472,7 +472,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/testing/Makefile.in b/testing/Makefile.in
@@ -352,7 +352,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/testing/backends/check/Makefile.in b/testing/backends/check/Makefile.in
@@ -320,7 +320,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/testing/selftest/Makefile.in b/testing/selftest/Makefile.in
@@ -596,7 +596,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/treeshr/testing/Makefile.in b/treeshr/testing/Makefile.in
@@ -517,7 +517,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@

diff --git a/wfevent/Makefile.in b/wfevent/Makefile.in
@@ -297,7 +297,6 @@ JARS_DIR = @JARS_DIR@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAVAC_PATH_NAME = @JAVAC_PATH_NAME@
-JAVAVERSION = @JAVAVERSION@
 JAVA_APS = @JAVA_APS@
 JAVA_JAR = @JAVA_JAR@
 JAVA_ONLY = @JAVA_ONLY@