Merge branch 'master' of ssh://mjb@git.ethernal.org/~/git/altos

diff --git a/altosui/.gitignore b/altosui/.gitignore
index 6d65611f7059e3c7fe199491cacfeec4111e8c0b..6d2d8c23f8cab1f96a3012893cf958f8a4d3ec59 100644 (file)
--- a/altosui/.gitignore
+++ b/altosui/.gitignore
@@ -5,6 +5,7 @@ fat/
 Manifest.txt
 Manifest-fat.txt
 AltosVersion.java
+Info.plist
 libaltosJNI
 classes
 altosui

diff --git a/ao-tools/ao-stmload/Makefile.am b/ao-tools/ao-stmload/Makefile.am
index 375896ea22af09343837a1474c416d9e0205cf25..5aea7db4ab48ceeb4a3c31e33c34f2279d2474c7 100644 (file)
--- a/ao-tools/ao-stmload/Makefile.am
+++ b/ao-tools/ao-stmload/Makefile.am
@@ -1,3 +1,5 @@
+if LIBSTLINK
+
 bin_PROGRAMS=ao-stmload
 
 LIBSTLINKDIR=/local/src/stlink
@@ -9,3 +11,5 @@ ao_stmload_LDADD=$(LIBSTLINK_LIBS) $(LIBUSB_LIBS) -lelf
 ao_stmload_SOURCES=ao-stmload.c
 
 man_MANS = ao-stmload.1
+
+endif

diff --git a/configure.ac b/configure.ac
index c59261afb96046aea487a038b1a8babd5c599548..a54ef626494dbe8e03699fe57f56c12ce7097776 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,9 @@ 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])
+PKG_CHECK_MODULES([LIBSTLINK], [stlink], [HAVE_STLINK=yes], [HAVE_STLINK=no])
+
+AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK != xno])
 
 AC_OUTPUT([
 Makefile