diff options
| author | Thomas Tsou <ttsou@vt.edu> | 2009-10-02 21:46:41 -0400 |
|---|---|---|
| committer | Thomas Tsou <ttsou@vt.edu> | 2009-10-03 13:08:04 -0400 |
| commit | d894a95ef6370f91ec14334e6b2b2f578a1cb090 (patch) | |
| tree | 31d0efe1684fbe9e571639e84bed9b44f78754b2 | |
| parent | 0cd478fdc090123e09b7ee21c88e5657abab8ae0 (diff) | |
usrp: Build fix for non-pkgconfig installs of libusb
| -rw-r--r-- | config/usrp_libusb.m4 | 6 | ||||
| -rw-r--r-- | usrp/host/lib/Makefile.am | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4 index 673fa994d0..73872eaef0 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]) diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index 17d4b80141..2f8cbe6dee 100644 --- 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 |