X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=8cc5adc11c010039976758d0336439c6f6bc46fe;hp=eaf8c03d95d37bac8de3559b5d08e69a21c41861;hb=17e894d1b65231d07df009bc4e8ca92864ccf790;hpb=b89fb51a963635e2effe3a31f803bfc29c2c46b7

diff --git a/configure.ac b/configure.ac
index eaf8c03d..8cc5adc1 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)
-AC_CONFIG_SRCDIR([src/core/ao.h])
+AC_INIT([altos], 1.4.9.1)
+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=3
+ALTOSLIB_VERSION=5
 
 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
@@ -430,12 +444,64 @@ if test x"$HAVE_STLINK" = "xyes"; then
 	AC_DEFINE(HAVE_STLINK,1,[Using STlink library])
 fi
 
-AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK == xyes])
+AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK = xyes])
+
+AC_ARG_ENABLE([multi-arch],
+	      [AS_HELP_STRING([--enable-multi-arch],
+			      [enable building both i386 and amd64 libraries (default=auto)])],
+	      [MULTI_ARCH=$enableval],
+	      [MULTI_ARCH=auto])
+
+case x"$MULTI_ARCH" in
+xauto)
+	arch=`uname -m`
+	case x"$arch" in
+	xx86_64|xi*86)
+		save_CFLAGS="$CFLAGS"
+		save_LIBS="$LIBS"
+		LIBS="-lbluetooth"
+		CFLAGS="-m64"
+		AC_MSG_CHECKING([if ]$CC[ ]$CFLAGS[ can link programs])
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
+				[M64_LINK=yes],
+				[M64_LINK=no])
+		AC_MSG_RESULT([$M64_LINK])
+		CFLAGS="-m32"
+		AC_MSG_CHECKING([if ]$CC[ ]$CFLAGS[ can link programs])
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
+				[M32_LINK=yes],
+				[M32_LINK=no])
+		AC_MSG_RESULT([$M32_LINK])
+		CFLAGS="$save_CFLAGS"
+		LIBS="$save_LIBS"
+		case x"$M64_LINK"x"$M32_LINK" in
+		xyesxyes)
+			MULTI_ARCH=yes
+			;;
+		*)
+			MULTI_ARCH=no
+			;;
+		esac
+		;;
+	*)
+		MULTI_ARCH=no
+		;;
+	esac
+	;;
+xyes|xno)
+	;;
+*)
+	MULTI_ARCH="no"
+	;;
+esac
+	
+AM_CONDITIONAL([MULTI_ARCH], [test x$MULTI_ARCH = xyes])
 
 AC_OUTPUT([
 Makefile
 src/Makedefs
 altoslib/Makefile
+icon/Makefile
 altosuilib/Makefile
 altosuilib/AltosUIVersion.java
 altosui/Makefile
@@ -445,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
@@ -465,6 +534,9 @@ ao-tools/ao-dump-up/Makefile
 ao-tools/ao-elftohex/Makefile
 ao-tools/ao-usbload/Makefile
 ao-tools/ao-flash/Makefile
+ao-tools/ao-test-igniter/Makefile
+ao-tools/ao-test-baro/Makefile
+ao-tools/ao-test-flash/Makefile
 ao-utils/Makefile
 src/Version
 ])
@@ -483,12 +555,14 @@ echo "    AVR support.................: ${HAVE_AVR_CC}"
 echo "    Android support.............: ${HAVE_ANDROID_SDK}"
 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"