X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=55dd20ec5cbd9ceb2c6b9925d809b4820336faf5;hp=27d56751b0322f25d24659249ea552054af138de;hb=868ef0c9c4b208c02a87180b0eede329369bdc77;hpb=3cea033ec928c21b9f7b810898ed3c3cc536d2ce

diff --git a/configure.ac b/configure.ac
index 27d56751..55dd20ec 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.0.1)
-AC_CONFIG_SRCDIR([src/ao.h])
+AC_INIT([altos], 1.1.9.2)
+AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -70,6 +70,33 @@ fi
 
 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=${ANDROID_SDK:-auto}])
+
+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 $HOME/android; do
+		if test "x$ANDROID_SDK" = "xauto"; then
+			SDK="$sdk"
+			if test -f "$SDK/SDK Readme.txt"; then
+				ANDROID_SDK=`readlink -m "$SDK"`
+			fi
+		fi
+	done
+	if test "x$ANDROID_SDK" = "xauto"; then
+		AC_MSG_NOTICE([no Android SDK found])
+		ANDROID_SDK=no
+	fi
+	AC_MSG_RESULT([$ANDROID_SDK])
+fi
+
+AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno])
+
+AC_SUBST(ANDROID_SDK)
+
 AC_ARG_WITH(fat-dir, AS_HELP_STRING([--with-fat-dir=PATH],
 	    [Set the directory to install the 'fat' distribution files to (defaults to not installing)]),
 	    [FATDIR=$withval], [FATDIR=none])
@@ -109,11 +136,23 @@ AC_CHECK_LIB(readline, readline)
 
 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], [HAVE_STLINK=yes], [HAVE_STLINK=no])
+
+AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK != xno])
+
 AC_OUTPUT([
 Makefile
+altoslib/Makefile
 altosui/Makefile
 altosui/AltosVersion.java
-altosui/libaltos/Makefile
+altosui/Info.plist
+libaltos/Makefile
+micropeak/Makefile
+altosdroid/Makefile
+altosdroid/local.properties
 ao-tools/Makefile
 ao-tools/lib/Makefile
 ao-tools/ao-rawload/Makefile
@@ -122,6 +161,10 @@ ao-tools/ao-bitbang/Makefile
 ao-tools/ao-eeprom/Makefile
 ao-tools/ao-list/Makefile
 ao-tools/ao-load/Makefile
+ao-tools/ao-telem/Makefile
+ao-tools/ao-stmload/Makefile
+ao-tools/ao-send-telem/Makefile
+ao-tools/ao-sky-flash/Makefile
 ao-utils/Makefile
 src/Version
 ])