X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=312f96788604765565ca63c5307f1eff3485ba3e;hp=78f5adbb82a7580791eae1fe13b4fa30c625b766;hb=3ac109132d1878abbd277ae21215716326404781;hpb=504ab7ab355652d5d01094c927089029596a0753

diff --git a/configure.ac b/configure.ac
index 78f5adbb..312f9678 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], 0.9.4.2)
-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])
@@ -95,20 +122,6 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(WARN_CFLAGS)
 
-AC_CHECK_HEADERS(flite/flite.h,HAVE_FLITE_H=yes,HAVE_FLITE_H=no)
-AC_CHECK_LIB(flite, flite_init,HAVE_LIBFLITE=yes,HAVE_LIBFLITE=no,-lasound -lm)
-
-if test "x$HAVE_FLITE_H" = "xyes" -a "x$HAVE_LIBFLITE" = "xyes"; then
-	AC_DEFINE(HAVE_FLITE,1,[Define if the flite library is usable])
-	AC_SUBST(FLITE_LIBS,"-lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex -lflite -lasound -lm")
-	AC_SUBST(FLITE_INCS,-Iflite)
-	save_LIBS="$LIBS"
-	LIBS="$LIBS $FLITE_LIBS"
-	AC_CHECK_FUNCS([register_cmu_us_kal16 register_cmu_us_kal],break)
-	LIBS="$save_LIBS"
-fi
-AM_CONDITIONAL(USE_FLITE,test "x$HAVE_FLITE_H" = "xyes" -a "x$HAVE_LIBFLITE" = "xyes")
-
 AC_CHECK_PROG([HAVE_SDCC], [sdcc], yes, no)
 if test "x$HAVE_SDCC" = "xno"; then
 	AC_MSG_ERROR([Please install sdcc to build AltOs])
@@ -121,32 +134,40 @@ fi
 
 AC_CHECK_LIB(readline, readline)
 
-PKG_CHECK_MODULES([GNOME], [gtk+-2.0 libglade-2.0 gconf-2.0])
-
 PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
 
-PKG_CHECK_MODULES([ALSA], [alsa])
+AC_CHECK_HEADERS(libelf.h libelf/libelf.h, [break])
+AC_CHECK_HEADERS(gelf.h libelf/gelf.h, [break])
 
-PKG_CHECK_MODULES([PLPLOT], [plplotd])
+PKG_CHECK_MODULES([LIBSTLINK], [stlink], [HAVE_STLINK=yes], [HAVE_STLINK=no])
 
-PKG_CHECK_MODULES([SNDFILE], [sndfile])
+AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK != xno])
 
 AC_OUTPUT([
 Makefile
+altoslib/Makefile
+altosuilib/Makefile
+altosuilib/AltosUIVersion.java
 altosui/Makefile
 altosui/AltosVersion.java
-altosui/libaltos/Makefile
+altosui/Info.plist
+libaltos/Makefile
+micropeak/Makefile
+micropeak/Info.plist
+altosdroid/Makefile
+altosdroid/local.properties
 ao-tools/Makefile
 ao-tools/lib/Makefile
 ao-tools/ao-rawload/Makefile
 ao-tools/ao-dbg/Makefile
-ao-tools/ao-dumplog/Makefile
 ao-tools/ao-bitbang/Makefile
 ao-tools/ao-eeprom/Makefile
 ao-tools/ao-list/Makefile
 ao-tools/ao-load/Makefile
-ao-tools/ao-postflight/Makefile
-ao-tools/ao-view/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
 ])