X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=f54a8b4c9480ef70e90265edb1ab0097718be1a5;hp=6ad2591c3a1ae25277f0094c38a4a06dc7eca045;hb=548cf57d5a5ea323bbfc3605b44c23fc48dec96b;hpb=65b512c890a3ccf487655b79305ab1cfcf49259c

diff --git a/configure.ac b/configure.ac
index 6ad2591c..f54a8b4c 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.1.9.2)
+AC_INIT([altos], 1.2)
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -26,6 +26,18 @@ AM_MAINTAINER_MODE
 VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
 AC_SUBST(VERSION_DASH)
 
+
+dnl ==========================================================================
+dnl Java library versions
+
+ALTOSUILIB_VERSION=1
+ALTOSLIB_VERSION=1
+
+AC_SUBST(ALTOSLIB_VERSION)
+AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
+AC_SUBST(ALTOSUILIB_VERSION)
+AC_DEFINE(ALTOSUILIB_VERSION,$ALTOSUILIB_VERSION,[Version of the AltosUILib package])
+
 dnl ==========================================================================
 
 AM_CONFIG_HEADER(config.h)
@@ -74,10 +86,8 @@ 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])
+	AC_MSG_CHECKING([Android SDK])
 	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"
@@ -92,6 +102,48 @@ if test "x$ANDROID_SDK" = "xauto"; then
 	fi
 	AC_MSG_RESULT([$ANDROID_SDK])
 fi
+if test "x$ANDROID_SDK" != "xno"; then
+	AC_MSG_CHECKING([Android SDK version])
+	SDK_VERSION=`grep -i '^Pkg.Revision=' $ANDROID_SDK/tools/source.properties | cut -f2- -d= | sed s/^r//`
+	SDK_MAJOR_VERSION="`echo $SDK_VERSION | sed 's/[[^0-9]].*//'`"
+	if test "$SDK_MAJOR_VERSION" -lt 17 ; then
+		AC_MSG_NOTICE([SDK version $SDK_VERSION is too old. Need >= r17])
+		ANDROID_SDK=no
+	else
+		AC_MSG_RESULT([$SDK_VERSION])
+	fi
+fi
+if test "x$ANDROID_SDK" != "xno"; then
+	AC_MSG_CHECKING([Android SDK API Level])
+	if test -f "$ANDROID_SDK/platforms/android-10/source.properties"; then
+		API_LEVEL=`sed -ne 's/^AndroidVersion.ApiLevel=//p' $ANDROID_SDK/platforms/android-10/source.properties`
+		if test "$API_LEVEL" = "10"; then
+			AC_MSG_RESULT([$API_LEVEL])
+		else
+			AC_MSG_NOTICE([API Level 10 not installed correctly.])
+			ANDROID_SDK=no
+		fi
+	else
+		AC_MSG_NOTICE([API Level 10 not installed, but is required.])
+		ANDROID_SDK=no
+	fi
+fi
+if test "x$ANDROID_SDK" != "xno"; then
+	AC_MSG_CHECKING([Android SDK required extras])
+	if test -f "$ANDROID_SDK/extras/android/support/source.properties"; then
+		ANDROID_SUPPORT_LIB_NAME=`sed -ne 's/^Extra.NameDisplay=//p' $ANDROID_SDK/extras/android/support/source.properties`
+		if test -f "$ANDROID_SDK/extras/google/google_play_services/source.properties"; then
+			GOOGLE_PLAY_SERVICES_NAME=`sed -ne 's/^Extra.NameDisplay=//p' $ANDROID_SDK/extras/google/google_play_services/source.properties`
+			AC_MSG_RESULT([$ANDROID_SUPPORT_LIB_NAME, $GOOGLE_PLAY_SERVICES_NAME])
+		else
+			AC_MSG_NOTICE([Google Play Services library not installed.])
+			ANDROID_SDK=no
+		fi
+	else
+		AC_MSG_NOTICE([Android Support Library not installed.])
+		ANDROID_SDK=no
+	fi
+fi
 
 AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno])
 
@@ -149,10 +201,12 @@ altoslib/Makefile
 altosuilib/Makefile
 altosuilib/AltosUIVersion.java
 altosui/Makefile
-altosui/AltosVersion.java
 altosui/Info.plist
+altosui/altos-windows.nsi
 libaltos/Makefile
 micropeak/Makefile
+micropeak/Info.plist
+micropeak/micropeak-windows.nsi
 altosdroid/Makefile
 altosdroid/local.properties
 ao-tools/Makefile
@@ -167,6 +221,9 @@ ao-tools/ao-telem/Makefile
 ao-tools/ao-stmload/Makefile
 ao-tools/ao-send-telem/Makefile
 ao-tools/ao-sky-flash/Makefile
+ao-tools/ao-dumpflash/Makefile
+ao-tools/ao-edit-telem/Makefile
+ao-tools/ao-dump-up/Makefile
 ao-utils/Makefile
 src/Version
 ])