diff options
| author | Mike Beattie <mike@ethernal.org> | 2012-08-02 21:18:15 +1200 |
|---|---|---|
| committer | Mike Beattie <mike@ethernal.org> | 2012-08-02 21:18:15 +1200 |
| commit | 7481d06bebc2dc1473f451971d8b744c9da4e726 (patch) | |
| tree | b97f445e61833ec37ba1dc3e791f1f206fcae9f0 | |
| parent | 599e28b2242c79bdd0960ef16e580e51a2fa3795 (diff) | |
| parent | c56dead72f65e7468017656347dba531ab2ca480 (diff) | |
Merge branch 'master' of ssh://mjb@git.ethernal.org/~/git/altos
| -rw-r--r-- | altosui/.gitignore | 1 | ||||
| -rw-r--r-- | ao-tools/ao-stmload/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/altosui/.gitignore b/altosui/.gitignore index 6d65611f..6d2d8c23 100644 --- 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 375896ea..5aea7db4 100644 --- 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 c59261af..a54ef626 100644 --- 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 |