X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=cbb4ce662164da7ff7fd6dcb0921b761e38b36ae;hp=959f3b4d86e2ce1a64b4216f7bc8d9398174432d;hb=7c6231ecef2e4f978a0de452a17a2a24e6e68827;hpb=f6f54d70b768dca1715ddddea64a4df00d82b09e

diff --git a/configure.ac b/configure.ac
index 959f3b4d..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.0)
+AC_INIT([altos], 1.1.9.0)
 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,22 @@ 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/Info.plist
 altosui/libaltos/Makefile
+altosdroid/Makefile
+altosdroid/local.properties
 ao-tools/Makefile
 ao-tools/lib/Makefile
 ao-tools/ao-rawload/Makefile
@@ -122,6 +160,9 @@ 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-utils/Makefile
 src/Version
 ])