summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorThomas Tsou2009-10-02 21:46:41 -0400
committerThomas Tsou2009-10-03 13:08:04 -0400
commitd894a95ef6370f91ec14334e6b2b2f578a1cb090 (patch)
tree31d0efe1684fbe9e571639e84bed9b44f78754b2 /config
parent0cd478fdc090123e09b7ee21c88e5657abab8ae0 (diff)
downloadgnuradio-d894a95ef6370f91ec14334e6b2b2f578a1cb090.tar.gz
gnuradio-d894a95ef6370f91ec14334e6b2b2f578a1cb090.tar.bz2
gnuradio-d894a95ef6370f91ec14334e6b2b2f578a1cb090.zip
usrp: Build fix for non-pkgconfig installs of libusb
Diffstat (limited to 'config')
-rw-r--r--config/usrp_libusb.m46
1 files changed, 5 insertions, 1 deletions
diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
index 673fa994d..73872eaef 100644
--- 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])