Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

diff --git a/autogen.sh b/autogen.sh
index 4e8b11ba9abd526410e44eb3a6264969e5657f5a..c838c5b38c48421564bd1f3cafe08d09897caae8 100755 (executable)
--- 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 "$@"

diff --git a/debian/control b/debian/control
index dec8481f62051c9a66ede507c9857b68a9374d4a..7607d38608852d63b97b731350f91519ecc6e3c6 100644 (file)
--- 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