diff options
| author | Marc Schink <openocd-dev@marcschink.de> | 2016-06-06 22:01:33 +0200 |
|---|---|---|
| committer | Paul Fertser <fercerpav@gmail.com> | 2016-11-05 20:38:51 +0000 |
| commit | 37ed4751e857563d39b2da04360c9bd2b576aed0 (patch) | |
| tree | 6fea6f9a3b7fe771a48643bf05c8c257412c8326 /src/Makefile.am | |
| parent | 21832327eed48be9d44607890d11d31b88d1bd30 (diff) | |
| download | riscv-openocd-37ed4751e857563d39b2da04360c9bd2b576aed0.zip riscv-openocd-37ed4751e857563d39b2da04360c9bd2b576aed0.tar.gz riscv-openocd-37ed4751e857563d39b2da04360c9bd2b576aed0.tar.bz2 | |
configure.ac: Fix libjaylink integration
Do not configure internal libjaylink if libusb-1.0 is not available or
if J-Link driver is disabled (--disable-jlink).
Change-Id: I021bca91dbbc33888a997c664f7836225306c3ef
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3528
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 26e02d0..fe40336 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,6 +76,10 @@ libopenocd_la_LIBADD = \ $(LIBFTDI_LIBS) $(MINGWLDADD) \ $(HIDAPI_LIBS) $(LIBUSB0_LIBS) $(LIBUSB1_LIBS) +if !INTERNAL_LIBJAYLINK +libopenocd_la_LIBADD += $(libjaylink_LIBS) +endif + STARTUP_TCL_SRCS = \ $(srcdir)/helper/startup.tcl \ $(srcdir)/jtag/startup.tcl \ |