usrp: Build fix for non-pkgconfig installs of libusb

diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
index 673fa994d0e54600117cba975767e3479d423825..73872eaef0fd619e95b090f578ec5c9887fae92b 100644 (file)
--- a/config/usrp_libusb.m4
+++ b/config/usrp_libusb.m4
@@ -31,7 +31,7 @@ AC_DEFUN([USRP_LIBUSB], [
       AC_LANG_PUSH(C)
       AC_CHECK_HEADERS([libusb-1.0/libusb.h], [have_libusb1=yes],
                        [libusbok=no; AC_MSG_RESULT([USRP requires libusb-1.0. libusb.h not found. See http://www.libusb.org])])
-      AC_SEARCH_LIBS(libusb_bulk_transfer, [usb], [USB_LIBS="$LIBS"],
+      AC_SEARCH_LIBS(libusb_bulk_transfer, [usb-1.0], [USB_LIBS="$LIBS"],
                      [libusbok=no; AC_MSG_RESULT([USRP requires libusb-1.0. libusb_bulk_transfer not found. See http://www.libusb.org])])
       AC_LANG_POP
     ])
@@ -55,6 +55,10 @@ AC_DEFUN([USRP_LIBUSB], [
     ])
   fi
 
+  if x$USB_INCLUDEDIR != x; then
+    USB_INCLUDES=-I$USB_INCLUDEDIR
+  fi
+
   if test x$libusbok = xyes; then
     AC_SUBST(USB_LIBS)
     ifelse([$2], , :, [$2])

diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index 17d4b80141d46b5a0d209cf6b87d30765eb3cf17..2f8cbe6deeb8c61cab8371641267056c65ecb18b 100644 (file)
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-common_INCLUDES = $(USRP_INCLUDES) -I$(USB_INCLUDEDIR)
+common_INCLUDES = $(USRP_INCLUDES) $(USB_INCLUDES)
 
 lib_LTLIBRARIES = libusrp.la