X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=9b0a3cef9a59c5be3e33d5d3b70d35431d19771f;hp=2c7b19c52d2b5e0d472a85ff4587747337d4c6df;hb=16482bf5d63eafc5256f14a218d3a374f6584e0a;hpb=e05e0c6b71a1df65f188e00622e9632eb27510fd

diff --git a/configure.ac b/configure.ac
index 2c7b19c5..9b0a3cef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,19 +18,24 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.5.9.1)
+AC_INIT([altos], 1.8.5.2)
+ANDROID_VERSION=17
 AC_CONFIG_SRCDIR([src/kernel/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
+RELEASE_DATE=2018-04-26
+AC_SUBST(RELEASE_DATE)
+
 VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
 AC_SUBST(VERSION_DASH)
+AC_SUBST(ANDROID_VERSION)
 
 dnl ==========================================================================
 dnl Java library versions
 
-ALTOSUILIB_VERSION=3
-ALTOSLIB_VERSION=5
+ALTOSUILIB_VERSION=12
+ALTOSLIB_VERSION=12
 
 AC_SUBST(ALTOSLIB_VERSION)
 AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
@@ -147,7 +152,7 @@ fi
 ANDROID_RELEASE=no
 if test "x$ANDROID_SDK" != "xno"; then
 	HAVE_ANDROID_SDK="yes"
-	if test -f "$HOME/altusmetrumllc/release.keystore" -a -f "$HOME/altusmetrumllc/Passphrase"; then
+	if test -f "$HOME/altusmetrumllc/google-play-release.keystore" -a -f "$HOME/altusmetrumllc/google-play-passphrase"; then
 		ANDROID_RELEASE=yes
 	fi
 else
@@ -160,7 +165,7 @@ AM_CONDITIONAL([ANDROID_RELEASE], [test x$ANDROID_RELEASE = xyes])
 AC_SUBST(ANDROID_SDK)
 
 AC_ARG_WITH(fat-dir, AS_HELP_STRING([--with-fat-dir=PATH],
-	    [Set the directory to install the 'fat' distribution files to (defaults to not installing)]),
+	    [Set the directory to install the 'fat-install' distribution files to (defaults to no such target)]),
 	    [FATDIR=$withval], [FATDIR=none])
 
 AM_CONDITIONAL(FATINSTALL, [test "x$FATDIR" != "xnone"])
@@ -172,7 +177,7 @@ AC_ARG_WITH(google-key, AS_HELP_STRING([--with-google-key=PATH],
 	    [GOOGLEKEYFILE=$withval], [GOOGLEKEYFILE=$HOME/altusmetrumllc/google-maps-api-key])
 
 if test -r "$GOOGLEKEYFILE" -a -s "$GOOGLEKEYFILE"; then
-	GOOGLEKEY='"'`cat "$GOOGLEKEYFILE"`'"'
+	GOOGLEKEY=`cat "$GOOGLEKEYFILE"`
 	HAVE_GOOGLE_KEY="yes"
 else
 	GOOGLEKEY='null'
@@ -513,10 +518,11 @@ AM_CONDITIONAL([INSTALL_SHARED_MIME_INFO], [test x$INSTALL_SHARED_MIME_INFO = xy
 AC_OUTPUT([
 Makefile
 src/Makedefs
+src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml
 altoslib/Makefile
+altoslib/AltosVersion.java
 icon/Makefile
 altosuilib/Makefile
-altosuilib/AltosUIVersion.java
 altosui/Makefile
 altosui/Info.plist
 altosui/altos-windows.nsi
@@ -529,6 +535,7 @@ telegps/Info.plist
 telegps/telegps-windows.nsi
 altosdroid/Makefile
 altosdroid/local.properties
+altosdroid/AndroidManifest.xml
 ao-tools/Makefile
 ao-tools/lib/Makefile
 ao-tools/ao-rawload/Makefile
@@ -551,7 +558,11 @@ ao-tools/ao-test-igniter/Makefile
 ao-tools/ao-test-baro/Makefile
 ao-tools/ao-test-flash/Makefile
 ao-tools/ao-cal-accel/Makefile
+ao-tools/ao-cal-freq/Makefile
 ao-tools/ao-test-gps/Makefile
+ao-tools/ao-usbtrng/Makefile
+ao-tools/ao-chaosread/Makefile
+ao-tools/ao-makebin/Makefile
 ao-utils/Makefile
 src/Version
 ])