diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/usrp_fusb_tech.m4 | 6 | ||||
| -rw-r--r-- | config/usrp_libusb.m4 | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/usrp_fusb_tech.m4 b/config/usrp_fusb_tech.m4 index bda6f5af9..196799e34 100644 --- a/config/usrp_fusb_tech.m4 +++ b/config/usrp_fusb_tech.m4 @@ -37,9 +37,9 @@ AC_DEFUN([USRP_SET_FUSB_TECHNIQUE],[ [x_have_usbdevice_fs_h=yes], [x_have_usbdevice_fs_h=no]) if test x${x_have_usbdevice_fs_h} = xyes; then - FUSB_TECH=libusb1 + FUSB_TECH=linux else - FUSB_TECH=libusb1 + FUSB_TECH=generic fi ;; darwin*) @@ -69,7 +69,7 @@ AC_DEFUN([USRP_SET_FUSB_TECHNIQUE],[ AM_CONDITIONAL(FUSB_TECH_darwin, test x$FUSB_TECH = xdarwin) AM_CONDITIONAL(FUSB_TECH_win32, test x$FUSB_TECH = xwin32) AM_CONDITIONAL(FUSB_TECH_generic, test x$FUSB_TECH = xgeneric) - AM_CONDITIONAL(FUSB_TECH_libusb1, test x$FUSB_TECH = xlibusb1) AM_CONDITIONAL(FUSB_TECH_linux, test x$FUSB_TECH = xlinux) + AM_CONDITIONAL(FUSB_TECH_libusb1, test x$FUSB_TECH = xlibusb1) AM_CONDITIONAL(FUSB_TECH_ra_wb, test x$FUSB_TECH = xra_wb) ]) diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4 index 503df51e5..cb3130c87 100644 --- a/config/usrp_libusb.m4 +++ b/config/usrp_libusb.m4 @@ -19,10 +19,10 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([USRP_LIBUSB], [ libusbok=yes - PKG_CHECK_MODULES(USB, libusb-1.0, [], [ + PKG_CHECK_MODULES(USB, libusb, [], [ AC_LANG_PUSH(C) - AC_CHECK_HEADERS([libusb.h], [], [libusbok=no; AC_MSG_RESULT([USRP requires libusb1. usb.h not found. See http://libusb.sf.net])]) + AC_CHECK_HEADERS([usb.h], [], [libusbok=no; AC_MSG_RESULT([USRP requires libusb. usb.h not found. See http://libusb.sf.net])]) save_LIBS="$LIBS" case "$host_os" in |