projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stmf0: Allow apps to leave interrupt vectors at 0
[fw/altos]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index e037e0f2983c2e4b71ef8c0233aa3b7d7dd8bd4e..a125033ed43070cde25904db631ca1683b5d528e 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-18,12
+18,15
@@
dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([altos], 1.6.
1.1
)
-ANDROID_VERSION=
9
+AC_INIT([altos], 1.6.
8
)
+ANDROID_VERSION=
13
AC_CONFIG_SRCDIR([src/kernel/ao.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR([src/kernel/ao.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+RELEASE_DATE=2017-01-10
+AC_SUBST(RELEASE_DATE)
+
VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
AC_SUBST(VERSION_DASH)
AC_SUBST(ANDROID_VERSION)
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
dnl ==========================================================================
dnl Java library versions
-ALTOSUILIB_VERSION=
8
-ALTOSLIB_VERSION=
8
+ALTOSUILIB_VERSION=
11
+ALTOSLIB_VERSION=
11
AC_SUBST(ALTOSLIB_VERSION)
AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
AC_SUBST(ALTOSLIB_VERSION)
AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
@@
-149,7
+152,7
@@
fi
ANDROID_RELEASE=no
if test "x$ANDROID_SDK" != "xno"; then
HAVE_ANDROID_SDK="yes"
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/P
assphrase"; then
+ if test -f "$HOME/altusmetrumllc/
google-play-release.keystore" -a -f "$HOME/altusmetrumllc/google-play-p
assphrase"; then
ANDROID_RELEASE=yes
fi
else
ANDROID_RELEASE=yes
fi
else
@@
-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
[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'
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
AC_OUTPUT([
Makefile
src/Makedefs
+src/chaoskey-v1.0/org.altusmetrum.ChaosKey.metainfo.xml
altoslib/Makefile
altoslib/AltosVersion.java
icon/Makefile
altoslib/Makefile
altoslib/AltosVersion.java
icon/Makefile
@@
-557,6
+561,8
@@
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-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
])
ao-utils/Makefile
src/Version
])