diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-06-15 17:47:41 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-06-15 17:47:41 -0600 |
| commit | c5cfc0d6e507d093987741b6ffaf69ebb24caa4b (patch) | |
| tree | a75b83343939e96592ac07178f2011d82ea6ded8 /configure.ac | |
| parent | 1b3d07ede530fa40cb7257fb1725c969ba60e0f0 (diff) | |
| parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) | |
Merge branch 'branch-1.4' into debian
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 6be99d1f..23dc9d82 100644 --- a/configure.ac +++ b/configure.ac @@ -18,8 +18,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([altos], 1.3.2) -AC_CONFIG_SRCDIR([src/core/ao.h]) +AC_INIT([altos], 1.4) +AC_CONFIG_SRCDIR([src/kernel/ao.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -29,8 +29,8 @@ AC_SUBST(VERSION_DASH) dnl ========================================================================== dnl Java library versions -ALTOSUILIB_VERSION=1 -ALTOSLIB_VERSION=3 +ALTOSUILIB_VERSION=2 +ALTOSLIB_VERSION=4 AC_SUBST(ALTOSLIB_VERSION) AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package]) @@ -162,6 +162,20 @@ 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]) + +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) + AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S @@ -487,6 +501,7 @@ AC_OUTPUT([ Makefile src/Makedefs altoslib/Makefile +icon/Makefile altosuilib/Makefile altosuilib/AltosUIVersion.java altosui/Makefile @@ -496,6 +511,9 @@ libaltos/Makefile micropeak/Makefile micropeak/Info.plist micropeak/micropeak-windows.nsi +telegps/Makefile +telegps/Info.plist +telegps/telegps-windows.nsi altosdroid/Makefile altosdroid/local.properties ao-tools/Makefile @@ -536,11 +554,12 @@ echo " STlink support..............: ${HAVE_STLINK}" echo " Local pdclib................: ${HAVE_PDCLIB}" echo " i386 and amd64 libaltos.....: ${MULTI_ARCH}" echo "" -echo " Java paths" +echo " Java" echo " freetts.....................: ${FREETTS}" echo " jfreechart..................: ${JFREECHART}" echo " jcommon.....................: ${JCOMMON}" echo " JVM include.................: ${JVM_INCLUDE}" +echo " Google maps API key.........: ${HAVE_GOOGLE_KEY}" if test x${ANDROID_SDK} != "xno"; then echo "" echo " Android path" |