Use discovered java path for compiler and jni include files

Instead of using the discovered java bits just for jni.h, also use
javac from that directory. Add JAVA_VERSION param to set language
version for newer compilers.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 82ad2eab84b89772e489d623ade8e552ea6df07d..d16a79d59f04126278053d1199be31245e048318 100644 (file)
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -1,4 +1,4 @@
-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked

 
 JAVAROOT=bin
 
 
 JAVAROOT=bin
 

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index b5fdf0f0e9500d7bc2677f2b813949495f088d80..1413de58e619538106d3dcf2ba74c727a7ec5220 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -1,6 +1,6 @@
 
 JAVAROOT=classes
 
 JAVAROOT=classes

-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked

 
 man_MANS=altosui.1
 
 
 man_MANS=altosui.1
 

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index 3b2e49d448094556e2010ff4a88a7475cfcaa1b6..10a5b494d3883477f3030aaeeaaebab22cb491d8 100644 (file)
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -1,4 +1,4 @@
-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked

 
 JAVAROOT=bin
 
 
 JAVAROOT=bin
 

diff --git a/configure.ac b/configure.ac
index 0e4b204c6cfd7a4d3b645641aa556777296a27e1..cc6a23d49e080b2acad00f8c45fedafc51007ca6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -64,27 +64,41 @@ AC_ARG_WITH(jcommon, AS_HELP_STRING([--with-jcommon=PATH],
 
 AC_SUBST(JCOMMON)
 
 
 AC_SUBST(JCOMMON)
 

-AC_ARG_WITH(jvm, AS_HELP_STRING([--with-jvm-include=PATH],
-       [Set jvm include path for jni builds (default searches in /usr/lib/jvm)]),
-       [JVM_INCLUDE=$withval], [JVM_INCLUDE=auto])
-
-if test "x$JVM_INCLUDE" = "xauto"; then
-       AC_MSG_CHECKING([JVM include files])
-       for jvm in default-java java-6-openjdk java-6-sun; do
-               if test "x$JVM_INCLUDE" = "xauto"; then
+AC_ARG_WITH(jvm, AS_HELP_STRING([--with-jvm=PATH],
+       [Set jvm path for java builds (default searches in /usr/lib/jvm)]),
+       [JVM=$withval], [JVM=auto])
+
+if test "x$JVM" = "xauto"; then
+       AC_MSG_CHECKING([JVM])
+       for jvm in default-java java-6-openjdk java-7-openjdk java-8-openjdk java-9-openjdk java-10-openjdk java-11-openjdk java-12-openjdk java-13-openjdk java-6-sun; do
+               if test "x$JVM" = "xauto"; then

                        INCLUDE="/usr/lib/jvm/$jvm/include"
                        if test -f "$INCLUDE"/jni.h; then
                        INCLUDE="/usr/lib/jvm/$jvm/include"
                        if test -f "$INCLUDE"/jni.h; then

-                               JVM_INCLUDE="$INCLUDE"
+                               JVM=/usr/lib/jvm/"$jvm"

                        fi
                fi
        done
                        fi
                fi
        done

-       if test "x$JVM_INCLUDE" = "xauto"; then
-               AC_MSG_ERROR([no JVM include files found])
+       if test "x$JVM" = "xauto"; then
+               AC_MSG_ERROR([no JVM files found])

        fi
        fi

-       AC_MSG_RESULT([$JVM_INCLUDE])
+       AC_MSG_RESULT([$JVM])

 fi
 
 fi
 

+AC_ARG_WITH(java-version, AS_HELP_STRING([--with-java-version=7],
+                                        [Set java language compatibility version (default is 7)]),
+          [JAVA_VERSION=$withval], [JAVA_VERSION=7])
+
+JAVAC="$JVM"/bin/javac
+JAVA="$JVM"/bin/java
+JVM_INCLUDE="$JVM"/include
+JAVAC_VERSION_FLAGS="-target 1.$JAVA_VERSION -source 1.$JAVA_VERSION"
+
+AC_SUBST(JAVAC)
+AC_SUBST(JAVA)
+AC_SUBST(JVM)

 AC_SUBST(JVM_INCLUDE)
 AC_SUBST(JVM_INCLUDE)

+AC_SUBST(JAVAC_VERSION_FLAGS)
+

 
 AC_ARG_WITH(android, AS_HELP_STRING([--with-android=PATH],
        [Set android SDK path (default searches in a variety of places)]),
 
 AC_ARG_WITH(android, AS_HELP_STRING([--with-android=PATH],
        [Set android SDK path (default searches in a variety of places)]),

diff --git a/libaltos/Makefile.am b/libaltos/Makefile.am
index 69fe7a5716a96d002eb94cb4854dc7f0aeb6d4b2..eb5eb6774fc5e42fa8b14dc1b428e1dd7fd919c4 100644 (file)
--- a/libaltos/Makefile.am
+++ b/libaltos/Makefile.am
@@ -1,6 +1,5 @@
-JAVAC=javac

 AM_CFLAGS=-DLINUX -DPOSIX_TTY -I$(JVM_INCLUDE) -I$(JVM_INCLUDE)/linux
 AM_CFLAGS=-DLINUX -DPOSIX_TTY -I$(JVM_INCLUDE) -I$(JVM_INCLUDE)/linux

-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
+AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked

 
 altoslibdir=$(libdir)/altos
 
 
 altoslibdir=$(libdir)/altos
 

diff --git a/map-server/altos-mapd/Makefile.am b/map-server/altos-mapd/Makefile.am
index 315a33d523c7ad9bb31c3a350e0b65ff96fa8a24..bb20dd845886ec795c4234006890f2351748b41a 100644 (file)
--- a/map-server/altos-mapd/Makefile.am
+++ b/map-server/altos-mapd/Makefile.am
@@ -1,5 +1,5 @@
 JAVAROOT=classes
 JAVAROOT=classes

-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked

 
 altoslibdir=$(libdir)/altos
 
 
 altoslibdir=$(libdir)/altos
 

diff --git a/map-server/altos-mapj/Makefile.am b/map-server/altos-mapj/Makefile.am
index 98d4f170d828d326d6e072ea9d68d99a66fd538b..a8dfffecc55a37a924ec469fe2ebe21e7a1893ae 100644 (file)
--- a/map-server/altos-mapj/Makefile.am
+++ b/map-server/altos-mapj/Makefile.am
@@ -1,5 +1,5 @@
 JAVAROOT=classes
 JAVAROOT=classes

-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked

 
 altoslibdir=$(libdir)/altos
 
 
 altoslibdir=$(libdir)/altos
 

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 7e9b490d326a2bc367226d521ac802233a72ebe0..23ec077ec4cda796c35f9b4d4970c2ec93621465 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -1,5 +1,5 @@
 JAVAROOT=classes
 JAVAROOT=classes

-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked

 
 man_MANS=micropeak.1
 
 
 man_MANS=micropeak.1
 

diff --git a/telegps/Makefile.am b/telegps/Makefile.am
index ae1e83e919414fa458616c11de956adc8abe4172..0e75abf1480996fadb88763f938a99d4d4173a2f 100644 (file)
--- a/telegps/Makefile.am
+++ b/telegps/Makefile.am
@@ -1,5 +1,5 @@
 JAVAROOT=classes
 JAVAROOT=classes

-AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked

 
 man_MANS=telegps.1
 
 
 man_MANS=telegps.1