Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

diff --combined configure.ac
index 7bb0136b79678d8218dbad96e05a7d028c2b3d1d,8b0026628de883d996401a3ac9213b0013685f20..cb765e1ed916ef37f54a4951e0a28d417ce1191f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -18,7 -18,7 +18,7 @@@ dn
  dnl Process this file with autoconf to create configure.
  
  AC_PREREQ(2.57)
 -AC_INIT([altos], 1.0.9.7)
 +AC_INIT([altos], 1.1)
  AC_CONFIG_SRCDIR([src/core/ao.h])
  AM_INIT_AUTOMAKE([foreign dist-bzip2])
  AM_MAINTAINER_MODE
@@@ -72,7 -72,7 +72,7 @@@ AC_SUBST(JVM_INCLUDE
  
  AC_ARG_WITH(android, AS_HELP_STRING([--with-android=PATH],
        [Set android SDK path (default searches in a variety of places)]),
-       [ANDROID_SDK=$withval], [ANDROID_SDK=auto])
+       [ANDROID_SDK=$withval], [ANDROID_SDK=${ANDROID_SDK:-auto}])
  
  echo ANDROID_SDK set to $ANDROID_SDK