diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2013-09-11 23:07:59 +0200 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2013-09-13 21:43:18 +0000 |
| commit | 191a5736c202dfb784e86a8190edc64e80dc62e5 (patch) | |
| tree | d56878000543ba0e217d6cce5953b9d18d1bc2a5 /src/jtag/drivers/mpsse.c | |
| parent | 10df176b0fb932d61f0dc5d6bfd0a0942501fc40 (diff) | |
libusb: require pkg-config support
An alternative approach to show how much cleaner the pure pkg-config
way is.
This changes the discovery procedures for libusb-1.0 and libusb-0.1,
making them depend on pkg-config being properly installed and
configured, including the necessary build host configuration for the
cross-builds (see
http://www.flameeyes.eu/autotools-mythbuster/pkgconfig/cross-compiling.html)
It should make it possible to compile OpenOCD without changes and
extra effort on GNU/Linux, FreeBSD users would need to supply a .pc
file for their libusb implementation or add LIBUSB1_LIBS and
LIBUSB1_CFLAGS to the configure environment.
Change-Id: I826e378dd1e0d101a549a573b2c63212a7e00b64
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1467
Reviewed-by: Xiaofan <xiaofanc@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Tested-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/jtag/drivers/mpsse.c')
| -rw-r--r-- | src/jtag/drivers/mpsse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jtag/drivers/mpsse.c b/src/jtag/drivers/mpsse.c index c5fd6d7f..c5e0b61c 100644 --- a/src/jtag/drivers/mpsse.c +++ b/src/jtag/drivers/mpsse.c @@ -24,7 +24,7 @@ #include "mpsse.h" #include "helper/log.h" -#include <libusb-1.0/libusb.h> +#include <libusb.h> /* Compatibility define for older libusb-1.0 */ #ifndef LIBUSB_CALL |