projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Remove GrabNDrag.java
[fw/altos]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index dc58fb4349cc15cc7772d82396bb7a2c985c9d71..6e02f968e320ccc40a32293f5df2b6636e7ffe11 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.7
)
-ANDROID_VERSION=1
3
+AC_INIT([altos], 1.
8.6.1
)
+ANDROID_VERSION=1
7
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=2018-06-17
+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=1
1
-ALTOSLIB_VERSION=1
1
+ALTOSUILIB_VERSION=1
3
+ALTOSLIB_VERSION=1
3
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])
@@
-162,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],
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"])
[FATDIR=$withval], [FATDIR=none])
AM_CONDITIONAL(FATINSTALL, [test "x$FATDIR" != "xnone"])
@@
-170,8
+173,8
@@
AM_CONDITIONAL(FATINSTALL, [test "x$FATDIR" != "xnone"])
AC_SUBST(FATDIR)
AC_ARG_WITH(google-key, AS_HELP_STRING([--with-google-key=PATH],
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])
+ [Set the file to read the
AltosDroid maps API key from (defaults to ~/altusmetrumllc/google-altosdroid
-maps-api-key)]),
+ [GOOGLEKEYFILE=$withval], [GOOGLEKEYFILE=$HOME/altusmetrumllc/google-
altosdroid-
maps-api-key])
if test -r "$GOOGLEKEYFILE" -a -s "$GOOGLEKEYFILE"; then
GOOGLEKEY=`cat "$GOOGLEKEYFILE"`
if test -r "$GOOGLEKEYFILE" -a -s "$GOOGLEKEYFILE"; then
GOOGLEKEY=`cat "$GOOGLEKEYFILE"`
@@
-181,6
+184,12
@@
else
HAVE_GOOGLE_KEY="no"
fi
HAVE_GOOGLE_KEY="no"
fi
+AC_ARG_ENABLE(faketime, AS_HELP_STRING([--enable-faketime],
+ [Use faketime program to ensure pdf files are reproducible (default=no)]),
+ [FAKETIME=$enableval], [FAKETIME=no])
+
+AM_CONDITIONAL(FAKETIME, [test x$FAKETIME = xyes])
+
AC_SUBST(GOOGLEKEY)
AC_PROG_CC
AC_SUBST(GOOGLEKEY)
AC_PROG_CC
@@
-408,6
+417,8
@@
if test "x$HAVE_NICKLE" = "xno"; then
AC_MSG_ERROR([Please install nickle to build AltOs])
fi
AC_MSG_ERROR([Please install nickle to build AltOs])
fi
+PKG_CHECK_MODULES([JANSSON], [jansson])
+
AC_ARG_WITH([readline],
[AS_HELP_STRING([--with-readline],
[enable readline functionality in ao-dbg @<:@default=auto@:>@])],
AC_ARG_WITH([readline],
[AS_HELP_STRING([--with-readline],
[enable readline functionality in ao-dbg @<:@default=auto@:>@])],
@@
-515,6
+526,8
@@
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
+doc/Makefile
altoslib/Makefile
altoslib/AltosVersion.java
icon/Makefile
altoslib/Makefile
altoslib/AltosVersion.java
icon/Makefile
@@
-560,6
+573,10
@@
ao-tools/ao-usbtrng/Makefile
ao-tools/ao-chaosread/Makefile
ao-tools/ao-makebin/Makefile
ao-utils/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
+map-server/altos-mapj/Makefile
src/Version
])
src/Version
])
@@
-586,7
+603,7
@@
echo " freetts.....................: ${FREETTS}"
echo " jfreechart..................: ${JFREECHART}"
echo " jcommon.....................: ${JCOMMON}"
echo " JVM include.................: ${JVM_INCLUDE}"
echo " jfreechart..................: ${JFREECHART}"
echo " jcommon.....................: ${JCOMMON}"
echo " JVM include.................: ${JVM_INCLUDE}"
-echo "
Google maps API key....
.....: ${HAVE_GOOGLE_KEY}"
+echo "
AltosDroid maps API key
.....: ${HAVE_GOOGLE_KEY}"
if test x${ANDROID_SDK} != "xno"; then
echo ""
echo " Android path"
if test x${ANDROID_SDK} != "xno"; then
echo ""
echo " Android path"