X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=cbb4ce662164da7ff7fd6dcb0921b761e38b36ae;hp=c59261afb96046aea487a038b1a8babd5c599548;hb=91b8c8b20cead2836ec835f44b4ca0cf06cbf518;hpb=59588ba34159b27c02e1a886b46497ecfa0cf4d3

diff --git a/configure.ac b/configure.ac
index c59261af..cbb4ce66 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.0.9.6)
+AC_INIT([altos], 1.1.9.0)
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -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
 
@@ -139,7 +139,9 @@ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
 AC_CHECK_HEADERS(libelf.h libelf/libelf.h, [break])
 AC_CHECK_HEADERS(gelf.h libelf/gelf.h, [break])
 
-PKG_CHECK_MODULES([LIBSTLINK], [stlink])
+PKG_CHECK_MODULES([LIBSTLINK], [stlink], [HAVE_STLINK=yes], [HAVE_STLINK=no])
+
+AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK != xno])
 
 AC_OUTPUT([
 Makefile