X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=c0e9968548da46e69dc4a2c32b24c83d1f1b66fa;hp=0e4b204c6cfd7a4d3b645641aa556777296a27e1;hb=4b824da227f08e45f7a1a59661b8c0fe45068d60;hpb=7a89aa1ea7e1b02b5cd310986adf4239ec0ce91d

diff --git a/configure.ac b/configure.ac
index 0e4b204c..c0e99685 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,13 +18,13 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.9)
-ANDROID_VERSION=18
+AC_INIT([altos], 1.9.1f)
+ANDROID_VERSION=26
 AC_CONFIG_SRCDIR([src/kernel/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-RELEASE_DATE=2018-12-31
+RELEASE_DATE=2019-12-05
 AC_SUBST(RELEASE_DATE)
 
 VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
@@ -64,27 +64,41 @@ AC_ARG_WITH(jcommon, AS_HELP_STRING([--with-jcommon=PATH],
 
 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])
+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_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
+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 java-8-openjdk-amd64; do
+		if test "x$JVM" = "xauto"; 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
-	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
-	AC_MSG_RESULT([$JVM_INCLUDE])
+	AC_MSG_RESULT([$JVM])
 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(JAVAC_VERSION_FLAGS)
+
 
 AC_ARG_WITH(android, AS_HELP_STRING([--with-android=PATH],
 	[Set android SDK path (default searches in a variety of places)]),
@@ -152,9 +166,7 @@ fi
 ANDROID_RELEASE=no
 if test "x$ANDROID_SDK" != "xno"; then
 	HAVE_ANDROID_SDK="yes"
-	if test -f "$HOME/altusmetrumllc/google-play-release.keystore" -a -f "$HOME/altusmetrumllc/google-play-passphrase"; then
-		ANDROID_RELEASE=yes
-	fi
+	ANDROID_RELEASE=yes
 else
 	HAVE_ANDROID_SDK="no"
 fi
@@ -541,7 +553,8 @@ telegps/Info.plist
 telegps/telegps-windows.nsi
 altosdroid/Makefile
 altosdroid/local.properties
-altosdroid/AndroidManifest.xml
+altosdroid/app/src/main/AndroidManifest.xml
+altosdroid/app/build.gradle
 ao-tools/Makefile
 ao-tools/lib/Makefile
 ao-tools/ao-rawload/Makefile