projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Allow products to define which LED to panic with
[fw/altos]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index b1ce03fe3ffd7b17d6298b676a1d56c6d53120c6..cbb4ce662164da7ff7fd6dcb0921b761e38b36ae 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-18,7
+18,7
@@
dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([altos], 1.
0.9.5
)
+AC_INIT([altos], 1.
1.9.0
)
AC_CONFIG_SRCDIR([src/core/ao.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR([src/core/ao.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@
-72,13
+72,13
@@
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)]),
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
if test "x$ANDROID_SDK" = "xauto"; then
AC_MSG_CHECKING([Android SDK files])
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; do
+ 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
if test "x$ANDROID_SDK" = "xauto"; then
SDK="$sdk"
if test -f "$SDK/SDK Readme.txt"; then
@@
-136,13
+136,22
@@
AC_CHECK_LIB(readline, readline)
PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
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
AC_OUTPUT([
Makefile
altoslib/Makefile
altosui/Makefile
altosui/AltosVersion.java
+altosui/Info.plist
altosui/libaltos/Makefile
altosdroid/Makefile
altosui/libaltos/Makefile
altosdroid/Makefile
+altosdroid/local.properties
ao-tools/Makefile
ao-tools/lib/Makefile
ao-tools/ao-rawload/Makefile
ao-tools/Makefile
ao-tools/lib/Makefile
ao-tools/ao-rawload/Makefile
@@
-152,6
+161,8
@@
ao-tools/ao-eeprom/Makefile
ao-tools/ao-list/Makefile
ao-tools/ao-load/Makefile
ao-tools/ao-telem/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
])
ao-utils/Makefile
src/Version
])