conditionalize build of ARM binaries on presence of arm-none-eabi-gcc in PATH

[fw/altos] / configure.ac

diff --git a/configure.ac b/configure.ac
index b1ce03fe3ffd7b17d6298b676a1d56c6d53120c6..a3004811d738df6806c46b7d520caa612392f90b 100644 (file)
--- 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.0.9.5)
+AC_INIT([altos], 1.0.9.6)
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -78,7 +78,7 @@ echo ANDROID_SDK set to $ANDROID_SDK
 
 if test "x$ANDROID_SDK" = "xauto"; then
        AC_MSG_CHECKING([Android SDK files])
-       for sdk in ../android/android-sdk-linux ../android/android-sdk ../android-sdk ../android-sdk-linux; do
+       for sdk in ../android/android-sdk-linux ../android/android-sdk ../android-sdk ../android-sdk-linux $HOME/android; do
                if test "x$ANDROID_SDK" = "xauto"; then
                        SDK="$sdk"
                        if test -f "$SDK/SDK Readme.txt"; then
@@ -143,6 +143,7 @@ altosui/Makefile
 altosui/AltosVersion.java
 altosui/libaltos/Makefile
 altosdroid/Makefile
+altosdroid/local.properties
 ao-tools/Makefile
 ao-tools/lib/Makefile
 ao-tools/ao-rawload/Makefile