[Patch-gnuradio] [PATCH 3/4] usrp: libusb-1.0 config

[Thomas Tsou]

Find libusb1-devel and use standard build process.

---
 config/usrp_fusb_tech.m4  |    5 +++--
 config/usrp_libusb.m4     |    4 ++--
 usrp/host/lib/Makefile.am |   13 +++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/config/usrp_fusb_tech.m4 b/config/usrp_fusb_tech.m4
index db85724..bda6f5a 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=linux
+              FUSB_TECH=libusb1
           else
-              FUSB_TECH=generic
+              FUSB_TECH=libusb1
           fi
           ;;
         darwin*)
@@ -69,6 +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_ra_wb,    test x$FUSB_TECH = xra_wb)
 ])
diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
index cb3130c..503df51 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, [], [
+    PKG_CHECK_MODULES(USB, libusb-1.0, [], [
         AC_LANG_PUSH(C)
 
-       AC_CHECK_HEADERS([usb.h], [], [libusbok=no; AC_MSG_RESULT([USRP 
requires libusb. usb.h not found. See http://libusb.sf.net])])
+       AC_CHECK_HEADERS([libusb.h], [], [libusbok=no; AC_MSG_RESULT([USRP 
requires libusb1. usb.h not found. See http://libusb.sf.net])])
 
        save_LIBS="$LIBS"
        case "$host_os" in
diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index 8e40692..e7c3f34 100644
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -84,6 +84,9 @@ ra_wb_CODE =                          \
        fusb_ra_wb.cc                   \
        fusb_sysconfig_ra_wb.cc
 
+libusb1_CODE =                         \
+       fusb_libusb1.cc                 \
+       fusb_sysconfig_libusb1.cc
 
 #
 # include each <foo>_CODE entry here...
@@ -93,8 +96,8 @@ EXTRA_libusrp_la_SOURCES =            \
        $(darwin_CODE)                  \
        $(win32_CODE)                   \
        $(linux_CODE)                   \
-       $(ra_wb_CODE)
-
+       $(ra_wb_CODE)                   \
+       $(libusb1_CODE)
 
 # work around automake deficiency
 libusrp_la_common_SOURCES =            \
@@ -141,6 +144,11 @@ if FUSB_TECH_ra_wb
 libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE)
 endif
 
+if FUSB_TECH_libusb1
+libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(libusb1_CODE)
+endif
+
+
 noinst_HEADERS =                       \
        ad9862.h                        \
        db_base_impl.h                  \
@@ -150,6 +158,7 @@ noinst_HEADERS =                    \
        fusb_darwin.h                   \
        fusb_generic.h                  \
        fusb_linux.h                    \
+       fusb_libusb1.h                  \
        fusb_ra_wb.h                    \
        fusb_win32.h                    \
        md5.h                           \
-- 
1.6.2.5