X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=741fa013d854a8394fa068668849091687cd724e;hp=020ee0317a4a8ff62f0baded540d566f09941cff;hb=ff5faf1cc710b7e9299dcaec719bc2421f4ca5b4;hpb=a61217f0a6d0ef48b6471f632c4600255867e831

diff --git a/configure.ac b/configure.ac
index 020ee031..741fa013 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.7)
-ANDROID_VERSION=14
+AC_INIT([altos], 1.8.6.1)
+ANDROID_VERSION=17
 AC_CONFIG_SRCDIR([src/kernel/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-RELEASE_DATE=2017-04-24
+RELEASE_DATE=2018-06-17
 AC_SUBST(RELEASE_DATE)
 
 VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
@@ -34,8 +34,8 @@ AC_SUBST(ANDROID_VERSION)
 dnl ==========================================================================
 dnl Java library versions
 
-ALTOSUILIB_VERSION=12
-ALTOSLIB_VERSION=12
+ALTOSUILIB_VERSION=13
+ALTOSLIB_VERSION=13
 
 AC_SUBST(ALTOSLIB_VERSION)
 AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
@@ -165,26 +165,18 @@ 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"])
 
 AC_SUBST(FATDIR)
 
-AC_ARG_WITH(google-key, AS_HELP_STRING([--with-google-key=PATH],
-	    [Set the file to read the google maps API key from (defaults to ~/altusmetrumllc/google-maps-api-key)]),
-	    [GOOGLEKEYFILE=$withval], [GOOGLEKEYFILE=$HOME/altusmetrumllc/google-maps-api-key])
+AC_ARG_ENABLE(faketime, AS_HELP_STRING([--enable-faketime],
+              [Use faketime program to ensure pdf files are reproducible (default=no)]),
+	      [FAKETIME=$enableval], [FAKETIME=no])
 
-if test -r "$GOOGLEKEYFILE" -a -s "$GOOGLEKEYFILE"; then
-	GOOGLEKEY=`cat "$GOOGLEKEYFILE"`
-	HAVE_GOOGLE_KEY="yes"
-else
-	GOOGLEKEY='null'
-	HAVE_GOOGLE_KEY="no"
-fi
-
-AC_SUBST(GOOGLEKEY)
+AM_CONDITIONAL(FAKETIME, [test x$FAKETIME = xyes])
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -519,6 +511,7 @@ AC_OUTPUT([
 Makefile
 src/Makedefs
 src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml
+doc/Makefile
 altoslib/Makefile
 altoslib/AltosVersion.java
 icon/Makefile
@@ -564,6 +557,9 @@ ao-tools/ao-usbtrng/Makefile
 ao-tools/ao-chaosread/Makefile
 ao-tools/ao-makebin/Makefile
 ao-utils/Makefile
+map-server/Makefile
+map-server/altos-mapd/Makefile
+map-server/altos-map/Makefile
 src/Version
 ])