diff options
| author | ttsou | 2009-09-14 18:51:28 -0400 |
|---|---|---|
| committer | ttsou | 2009-09-16 17:08:52 -0400 |
| commit | dce6d742c364daedda2f6e79da09e552ee910ede (patch) | |
| tree | 1b1b04050e02b9fd8bdb26ba531ff6a93a69b308 /config | |
| parent | 68b0364367f8d99a34f0c38e8a0db0a290f297fc (diff) | |
| download | gnuradio-dce6d742c364daedda2f6e79da09e552ee910ede.tar.gz gnuradio-dce6d742c364daedda2f6e79da09e552ee910ede.tar.bz2 gnuradio-dce6d742c364daedda2f6e79da09e552ee910ede.zip | |
Fixed libusb1 configure bug, libusb1 updates for previous usrp_prims integration
Diffstat (limited to 'config')
| -rw-r--r-- | config/grc_usrp.m4 | 2 | ||||
| -rw-r--r-- | config/usrp_libusb.m4 | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4 index b9740aea7..286641928 100644 --- a/config/grc_usrp.m4 +++ b/config/grc_usrp.m4 @@ -45,7 +45,7 @@ AC_DEFUN([GRC_USRP],[ AC_CHECK_FUNCS([sigaction snprintf]) dnl Make sure libusb version is installed; required for legacy USB - USRP_LIBUSB([$req_libusb1],[passed=no;AC_MSG_RESULT([Unable to find dependency libusb.])]) + USRP_LIBUSB([$req_libusb1],[],[passed=no;AC_MSG_RESULT([Unable to find dependency libusb.])]) dnl Make sure SDCC >= 2.4.0 is available. USRP_SDCC([2.4.0],[],[passed=no;AC_MSG_RESULT([Unable to find firmware compiler SDCC.])]) diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4 index 593ffbd5c..d5f12ad7b 100644 --- a/config/usrp_libusb.m4 +++ b/config/usrp_libusb.m4 @@ -118,6 +118,7 @@ _EOF_ if test x$have_libusb1 = xyes; then echo 'struct libusb_device;' >> $tmpfile echo 'struct libusb_device_handle;' >> $tmpfile + echo 'struct libusb_device_descriptor;' >> $tmpfile echo >> $tmpfile fi @@ -132,9 +133,9 @@ _EOF_ have_libusb1=$have_libusb1 ]) - AC_SUBST(USB_LIBS) - ifelse([$1], , :, [$1]) + AC_SUBST(USB_LIBS) + ifelse([$2], , :, [$2]) else - ifelse([$2], , :, [$2]) + ifelse([$3], , :, [$3]) fi ]) |