Fixed libusb1 configure bug, libusb1 updates for previous usrp_prims integration

[debian/gnuradio] / config / usrp_libusb.m4

diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
index 593ffbd5cdfbb8fb2f027ede68a1e09f8b9c43c8..d5f12ad7bba8c95127d5db941e5ab6519231b40c 100644 (file)
--- 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
 ])