1*4882a593SmuzhiyunFrom 1eed2b65eff4c66b80eab0ec46c6705de19bdb9d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 3*4882a593SmuzhiyunDate: Thu, 21 Jan 2016 23:54:03 +0100 4*4882a593SmuzhiyunSubject: [PATCH] build: use pkg-config to discover libusb 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThis allows to remove hardcoded paths to libusb headers. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 9*4882a593Smuzhiyun--- 10*4882a593Smuzhiyun Makefile.am | 4 ++-- 11*4882a593Smuzhiyun configure.in | 3 +-- 12*4882a593Smuzhiyun 2 files changed, 3 insertions(+), 4 deletions(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/Makefile.am b/Makefile.am 15*4882a593Smuzhiyunindex 73fed2e..3a4e899 100644 16*4882a593Smuzhiyun--- a/Makefile.am 17*4882a593Smuzhiyun+++ b/Makefile.am 18*4882a593Smuzhiyun@@ -92,8 +92,8 @@ libhpmud_la_SOURCES += io/hpmud/musb_libusb01.c 19*4882a593Smuzhiyun libhpmud_la_LDFLAGS += -lusb 20*4882a593Smuzhiyun else 21*4882a593Smuzhiyun libhpmud_la_SOURCES += io/hpmud/musb.c 22*4882a593Smuzhiyun-libhpmud_la_CFLAGS += -I/usr/include/libusb-1.0 23*4882a593Smuzhiyun-libhpmud_la_LDFLAGS += -lusb-1.0 24*4882a593Smuzhiyun+libhpmud_la_CFLAGS += $(LIBUSB_CFLAGS) 25*4882a593Smuzhiyun+libhpmud_la_LDFLAGS += $(LIBUSB_LIBS) 26*4882a593Smuzhiyun endif 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun if NETWORK_BUILD 29*4882a593Smuzhiyundiff --git a/configure.in b/configure.in 30*4882a593Smuzhiyunindex 3706645..8b06428 100755 31*4882a593Smuzhiyun--- a/configure.in 32*4882a593Smuzhiyun+++ b/configure.in 33*4882a593Smuzhiyun@@ -542,8 +542,7 @@ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then 34*4882a593Smuzhiyun AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) 35*4882a593Smuzhiyun AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) 36*4882a593Smuzhiyun else 37*4882a593Smuzhiyun- AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)]) 38*4882a593Smuzhiyun- AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)]) 39*4882a593Smuzhiyun+ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0]) 40*4882a593Smuzhiyun fi 41*4882a593Smuzhiyun fi 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun-- 44*4882a593Smuzhiyun2.6.4 45*4882a593Smuzhiyun 46