From dcd21630e26494db41c37ab762a230b27752d2e8 Mon Sep 17 00:00:00 2001
From: paulc <paulc@acf43c95-373e-0410-b603-e72c3f656dc1>
Date: Tue, 30 Jun 2015 11:27:23 +0000
Subject: [PATCH] Added support for libusb-1.0 older than 1.0.9 release.

git-svn-id: http://yate.null.ro/svn/yate/trunk@5983 acf43c95-373e-0410-b603-e72c3f656dc1
---
 configure.ac               | 7 ++++---
 modules/radio/ybladerf.cpp | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index dab20f0a..e7386446 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1462,13 +1462,14 @@ if [[ "x$ac_cv_use_libusb" != "xno" ]]; then
 	SAVE_CFLAGS="$CFLAGS"
 	LIBS="$LIBS -lusb-1.0"
 	CFLAGS="$CFLAGS -I$ac_cv_use_libusb/include/libusb-1.0"
-	AC_TRY_LINK([#include <libusb.h>],[libusb_get_version();],[HAVE_LIBUSB=yes],[HAVE_LIBUSB=no])
-	LIBS="$SAVE_LIBS"
-	CFLAGS="$SAVE_CFLAGS"
+	AC_TRY_LINK([#include <libusb.h>],[libusb_has_capability(0);],[HAVE_LIBUSB=yes],[HAVE_LIBUSB=no])
 	if [[ "$HAVE_LIBUSB" = "yes" ]]; then
 	    LIBUSB_INC="-I$ac_cv_use_libusb/include/libusb-1.0"
 	    LIBUSB_LIB="-lusb-1.0"
+	    AC_TRY_LINK([#include <libusb.h>],[libusb_get_version();],[LIBUSB_INC="-DHAVE_LIBUSB_VER $LIBUSB_INC"])
 	fi
+	LIBS="$SAVE_LIBS"
+	CFLAGS="$SAVE_CFLAGS"
     fi
     AC_MSG_RESULT([$HAVE_LIBUSB])
 fi
diff --git a/modules/radio/ybladerf.cpp b/modules/radio/ybladerf.cpp
index 977f3665..31bc67ef 100644
--- a/modules/radio/ybladerf.cpp
+++ b/modules/radio/ybladerf.cpp
@@ -6388,12 +6388,16 @@ BrfModule::BrfModule()
     m_ifaceId(0)
 {
     String tmp;
+#ifdef HAVE_LIBUSB_VER
     const libusb_version* ver = ::libusb_get_version();
     tmp.printf(" using libusb %u.%u.%u.%u",ver->major,ver->minor,ver->micro,ver->nano);
     if (!TelEngine::null(ver->rc))
 	tmp << " rc='" << ver->rc << "'";
     if (!TelEngine::null(ver->describe))
 	tmp << " desc='" << ver->describe << "'";
+#else
+    tmp = " using old libusb 1.0";
+#endif
     Output("Loaded module BladeRF%s",tmp.safe());
 }