From 191a5736c202dfb784e86a8190edc64e80dc62e5 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Wed, 11 Sep 2013 23:07:59 +0200 Subject: 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 Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/1467 Reviewed-by: Xiaofan Reviewed-by: Spencer Oliver Tested-by: Spencer Oliver --- src/helper/Makefile.am | 2 ++ src/helper/replacements.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/helper') diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index 9e27d05..215bbae 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -5,6 +5,8 @@ noinst_LTLIBRARIES = libhelper.la CONFIGFILES = options.c time_support_common.c +libhelper_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) + libhelper_la_SOURCES = \ binarybuffer.c \ $(CONFIGFILES) \ diff --git a/src/helper/replacements.c b/src/helper/replacements.c index d8d8fd0..b083096 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 +#include /* Verbatim from git://git.libusb.org/libusb.git tag 1.0.9 * The libusb_error enum is compatible down to v0.9.1 */ -- cgit v1.1