X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=5186016bfa12143be29a1c6b40b9f31a4110cbe6;hp=c2b8b55cd00afe9909e293aaf3fa4c97be7e650e;hb=bf08397202860a73417cd1711012eb3e33f308c3;hpb=54b58e925e27e87bf2903678f87b7544ee2e8167

diff --git a/configure.ac b/configure.ac
index c2b8b55c..5186016b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.4.9.2)
+AC_INIT([altos], 1.5.9.1)
 AC_CONFIG_SRCDIR([src/kernel/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -144,13 +144,18 @@ if test "x$ANDROID_SDK" != "xno"; then
 	fi
 fi
 
+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/Passphrase"; then
+		ANDROID_RELEASE=yes
+	fi
 else
 	HAVE_ANDROID_SDK="no"
 fi
 
 AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno])
+AM_CONDITIONAL([ANDROID_RELEASE], [test x$ANDROID_RELEASE = xyes])
 
 AC_SUBST(ANDROID_SDK)
 
@@ -459,7 +464,7 @@ xauto)
 	xx86_64|xi*86)
 		save_CFLAGS="$CFLAGS"
 		save_LIBS="$LIBS"
-		LIBS="-lbluetooth"
+		LIBS="-ldl"
 		CFLAGS="-m64"
 		AC_MSG_CHECKING([if ]$CC[ ]$CFLAGS[ can link programs])
 		AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
@@ -497,6 +502,14 @@ esac
 	
 AM_CONDITIONAL([MULTI_ARCH], [test x$MULTI_ARCH = xyes])
 
+AC_ARG_ENABLE([install-shared-mime-info],
+	      [AS_HELP_STRING([--disable-install-shared-mime-info],
+	                      [disable installing shared mime info files (default=yes)])],
+	      [INSTALL_SHARED_MIME_INFO=$enableval],
+	      [INSTALL_SHARED_MIME_INFO=yes])
+
+AM_CONDITIONAL([INSTALL_SHARED_MIME_INFO], [test x$INSTALL_SHARED_MIME_INFO = xyes])
+
 AC_OUTPUT([
 Makefile
 src/Makedefs
@@ -537,6 +550,9 @@ ao-tools/ao-flash/Makefile
 ao-tools/ao-test-igniter/Makefile
 ao-tools/ao-test-baro/Makefile
 ao-tools/ao-test-flash/Makefile
+ao-tools/ao-cal-accel/Makefile
+ao-tools/ao-test-gps/Makefile
+ao-tools/ao-usbtrng/Makefile
 ao-utils/Makefile
 src/Version
 ])
@@ -553,9 +569,11 @@ echo "    CC1111 support..............: ${HAVE_SDCC}"
 echo "    AVR compiler................: ${AVR_CC} ${AVR_OBJCOPY}"
 echo "    AVR support.................: ${HAVE_AVR_CC}"
 echo "    Android support.............: ${HAVE_ANDROID_SDK}"
+echo "    Android release support.....: ${ANDROID_RELEASE}"
 echo "    STlink support..............: ${HAVE_STLINK}"
 echo "    Local pdclib................: ${HAVE_PDCLIB}"
 echo "    i386 and amd64 libaltos.....: ${MULTI_ARCH}"
+echo "    install shared mime info....: ${INSTALL_SHARED_MIME_INFO}"
 echo ""
 echo "  Java"
 echo "    freetts.....................: ${FREETTS}"