X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.ac;h=c0e9968548da46e69dc4a2c32b24c83d1f1b66fa;hb=9ad50b83eca7aea8c9e568a661fcdd98598d0c73;hp=cc6a23d49e080b2acad00f8c45fedafc51007ca6;hpb=318b81d59e6f34a92a7a78c0896aa331bc14d0a1;p=fw%2Faltos

diff --git a/configure.ac b/configure.ac
index cc6a23d4..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'`
@@ -70,7 +70,7 @@ AC_ARG_WITH(jvm, AS_HELP_STRING([--with-jvm=PATH],
 
 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
+	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
@@ -166,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
@@ -555,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