From 37ed4751e857563d39b2da04360c9bd2b576aed0 Mon Sep 17 00:00:00 2001 From: Marc Schink Date: Mon, 6 Jun 2016 22:01:33 +0200 Subject: 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 Reviewed-on: http://openocd.zylin.com/3528 Tested-by: jenkins Reviewed-by: Paul Fertser --- src/jtag/drivers/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/jtag/drivers') diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 2aaf8fd8..00d8371c 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -33,6 +33,7 @@ noinst_LTLIBRARIES += libjaylink_internal.la libocdjtagdrivers_la_LIBADD += libjaylink_internal.la else DRIVERFILES += jlink.c +libocdjtagdrivers_la_CPPFLAGS += $(libjaylink_CFLAGS) endif endif -- cgit v1.2.3-18-g5258