X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=3e6658e9d45cd96bba45123b273c5be2740cc21d;hp=1a256d6798be2a1dd8624e754e7f85bccd2db2d3;hb=238e56e0f6ab2f623e0faf25298b38dc3a4aff74;hpb=c989237366ada094cdc817f50b7f58bbcf5b377a diff --git a/configure.ac b/configure.ac index 1a256d67..3e6658e9 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,15 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([altos], 1.6.2) -ANDROID_VERSION=11 +AC_INIT([altos], 1.7) +ANDROID_VERSION=14 AC_CONFIG_SRCDIR([src/kernel/ao.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +RELEASE_DATE=2017-04-24 +AC_SUBST(RELEASE_DATE) + VERSION_DASH=`echo $VERSION | sed 's/\./-/g'` AC_SUBST(VERSION_DASH) AC_SUBST(ANDROID_VERSION) @@ -31,8 +34,8 @@ AC_SUBST(ANDROID_VERSION) dnl ========================================================================== dnl Java library versions -ALTOSUILIB_VERSION=10 -ALTOSLIB_VERSION=10 +ALTOSUILIB_VERSION=11 +ALTOSLIB_VERSION=11 AC_SUBST(ALTOSLIB_VERSION) AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package]) @@ -174,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' @@ -515,6 +518,7 @@ 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