aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMarc Schink <openocd-dev@marcschink.de>2017-05-20 14:34:21 +0200
committerSpencer Oliver <spen@spen-soft.co.uk>2017-10-03 11:18:40 +0100
commit7d8d2654e6168a56a8e5e53aa4a8b64a66576c55 (patch)
tree41f6cd67c1a8bd025ebbdc6c16d0a1c94ee048f2 /configure.ac
parentba24c1fc05c8bb244abab513b880c7e9ec50ea73 (diff)
downloadriscv-openocd-7d8d2654e6168a56a8e5e53aa4a8b64a66576c55.zip
riscv-openocd-7d8d2654e6168a56a8e5e53aa4a8b64a66576c55.tar.gz
riscv-openocd-7d8d2654e6168a56a8e5e53aa4a8b64a66576c55.tar.bz2
jlink: Make libusb optional
libusb is now optional for libjaylink because support for TCP/IP devices is always available. Change-Id: I03f2566f8e1703276671ac0f353f72394d21f2f0 Signed-off-by: Marc Schink <openocd-dev@marcschink.de> Reviewed-on: http://openocd.zylin.com/4204 Tested-by: jenkins Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index fd06a0b..562ec5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -655,7 +655,7 @@ PROCESS_ADAPTERS([USB0_ADAPTERS], ["x$use_libusb0" = "xyes"], [libusb-0.1])
PROCESS_ADAPTERS([HIDAPI_ADAPTERS], ["x$use_hidapi" = "xyes"], [hidapi])
PROCESS_ADAPTERS([HIDAPI_USB1_ADAPTERS], ["x$use_hidapi" = "xyes" -a "x$use_libusb1" = "xyes"], [hidapi and libusb-1.x])
PROCESS_ADAPTERS([LIBFTDI_ADAPTERS], ["x$use_libftdi" = "xyes"], [libftdi])
-PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_libusb1" = "xyes" -a "x$use_internal_libjaylink" = "xyes" -o "x$use_libjaylink" = "xyes"], [libusb-1.x or libjaylink-0.1])
+PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_internal_libjaylink" = "xyes" -o "x$use_libjaylink" = "xyes"], [libjaylink-0.1])
AS_IF([test "x$build_openjtag" = "xyes"], [
AS_IF([test "x$use_libusb1" != "xyes" -a "x$use_libusb0" != "xyes"], [