diff options
| author | Keith Packard <keithp@keithp.com> | 2013-05-02 23:17:17 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-05-02 23:17:17 -0700 |
| commit | d6900a5d1fc24f007fc479eb528b199dd195e1eb (patch) | |
| tree | e6207fa4ee032a6b04f876f5dca43ad5b301d02f | |
| parent | 39dcd19ded04175a074c9541c5e1752bac3eda8c (diff) | |
| parent | 1629acba4a63baae2c687ed56a17d02faf45f5e5 (diff) | |
Merge remote-tracking branch 'origin/master' into stm-flash
Conflicts:
altosdroid/Notebook
| -rw-r--r-- | altosdroid/Notebook | 3 | ||||
| -rwxr-xr-x | autogen.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | debian/control | 2 |
4 files changed, 39 insertions, 3 deletions
diff --git a/altosdroid/Notebook b/altosdroid/Notebook index 6c5cfacf..22f0394b 100644 --- a/altosdroid/Notebook +++ b/altosdroid/Notebook @@ -23,3 +23,6 @@ Desired AltosDroid feature list *) Re-loading flight data from .telem file to get back to 'find my rocket' mode after shutting down the application. + + *) Remember most-recently-used TBT and frequency, perhaps + auto-connect at startup. @@ -9,4 +9,5 @@ cd $srcdir autoreconf --force -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +PKG_CONFIG_PATH=/opt/cortex/lib/pkgconfig \ + $srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac index f54a8b4c..46467705 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,12 @@ if test "x$ANDROID_SDK" != "xno"; then fi fi +if test "x$ANDROID_SDK" != "xno"; then + HAVE_ANDROID_SDK="yes" +else + HAVE_ANDROD_SDK="no" +fi + AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno]) AC_SUBST(ANDROID_SDK) @@ -176,7 +182,12 @@ AC_SUBST(WARN_CFLAGS) AC_CHECK_PROG([HAVE_SDCC], [sdcc], yes, no) if test "x$HAVE_SDCC" = "xno"; then - AC_MSG_ERROR([Please install sdcc to build AltOs]) + AC_MSG_WARN([No sdcc found, cc1111 binaries will not be built]) +fi + +AC_CHECK_PROG([HAVE_ARM_GCC], [arm-none-eabi-gcc], yes, no) +if test "x$HAVE_ARM_GCC" = "xno"; then + AC_MSG_WARN([No arm compiler found, STM32L and LPC11U14 binaries will not be built]) fi AC_CHECK_PROG([HAVE_NICKLE], [nickle], yes, no) @@ -227,3 +238,24 @@ ao-tools/ao-dump-up/Makefile ao-utils/Makefile src/Version ]) + +echo "" +echo " Package: ${PACKAGE_NAME} ${PACKAGE_VERSION}" +echo "" +echo " Configuration" +echo " STM32L/LPC11U14 support.....: ${HAVE_ARM_GCC}" +echo " CC1111 support..............: ${HAVE_SDCC}" +echo " Android support.............: ${HAVE_ANDROID_SDK}" +echo " STlink support..............: ${HAVE_STLINK}" +echo "" +echo " Java paths" +echo " freetts.....................: ${FREETTS}" +echo " jfreechart..................: ${JFREECHART}" +echo " jcommon.....................: ${JCOMMON}" +echo " JVM include.................: ${JVM_INCLUDE}" +if test x${ANDROID_SDK} != "xno"; then +echo "" +echo " Android path" +echo " Android SDK.................: ${ANDROID_SDK}" +fi +echo "" diff --git a/debian/control b/debian/control index dec8481f..7607d386 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: electronics Priority: optional Maintainer: Bdale Garbee <bdale@gag.com> Uploaders: Keith Packard <keithp@keithp.com> -Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev +Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev Standards-Version: 3.9.3 Homepage: http://altusmetrum.org/AltOS Vcs-Git: git://git.gag.com/fw/altos |