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/helper/replacements.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/helper/replacements.c')
| -rw-r--r-- | src/helper/replacements.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/helper/replacements.c b/src/helper/replacements.c index d8d8fd0b..b083096f 100644 --- a/src/helper/replacements.c +++ b/src/helper/replacements.c @@ -278,7 +278,7 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time #endif #if defined HAVE_LIBUSB1 && !defined HAVE_LIBUSB_ERROR_NAME -#include <libusb-1.0/libusb.h> +#include <libusb.h> /* Verbatim from git://git.libusb.org/libusb.git tag 1.0.9 * The libusb_error enum is compatible down to v0.9.1 */ |