diff options
| author | Keith Packard <keithp@keithp.com> | 2012-08-07 11:48:20 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-08-07 11:48:20 -0700 |
| commit | 4d4ad34aec0c75c66162b992f1e52947e4685730 (patch) | |
| tree | ab7a29204eea195db77aa302fbe3e2012ef5049e /configure.ac | |
| parent | c7f228503870c44dfd278ede8b0980dbac73d3c7 (diff) | |
| parent | 8e4ebd1f6eb928b5cb7bcda4ed88851aa9e61bdf (diff) | |
Merge remote-tracking branch 'mjb/master'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
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 |