From 55915098f2668e3a71568d51a9888dc4bdf40992 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 27 Apr 2013 16:07:34 -0700
Subject: altosdroid: Add wish for persistent TBT and freq settings

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/Notebook | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/altosdroid/Notebook b/altosdroid/Notebook
index 912a835c..b2ae407c 100644
--- a/altosdroid/Notebook
+++ b/altosdroid/Notebook
@@ -20,3 +20,7 @@ Desired AltosDroid feature list
  *) Frequency scanning
 
  *) Select satellite imaging mode
+
+ *) Remember most-recently-used TBT and frequency, perhaps
+    auto-connect at startup.
+    
-- 
cgit v1.2.3


From f2a8ac537d254cc08c0be9c16bf2d5cc03fd04fc Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Mon, 29 Apr 2013 17:06:57 -0600
Subject: point to pkgconfig content in /opt/cortex so stlink stuff works

---
 autogen.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 4e8b11ba..c838c5b3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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 "$@"
-- 
cgit v1.2.3


From 75f8229d4a8d7c9a28ea3d88fda72af0d1f1ccc2 Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Mon, 29 Apr 2013 17:11:48 -0600
Subject: add libssl-dev as a build dep since it's used in FAT filesystem test
 code

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3


From 1629acba4a63baae2c687ed56a17d02faf45f5e5 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 2 May 2013 23:14:02 -0700
Subject: Allow build without SDCC

The AltOS directory handles not building the cc1111 apps when sdcc is
missing already, so don't require it, just whinge if it's missing

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 configure.ac | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

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 ""
-- 
cgit v1.2.3