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
This commit is contained in:
parent
436ef0ce30
commit
dcd21630e2
|
@ -1462,13 +1462,14 @@ if [[ "x$ac_cv_use_libusb" != "xno" ]]; then
|
||||||
SAVE_CFLAGS="$CFLAGS"
|
SAVE_CFLAGS="$CFLAGS"
|
||||||
LIBS="$LIBS -lusb-1.0"
|
LIBS="$LIBS -lusb-1.0"
|
||||||
CFLAGS="$CFLAGS -I$ac_cv_use_libusb/include/libusb-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])
|
AC_TRY_LINK([#include <libusb.h>],[libusb_has_capability(0);],[HAVE_LIBUSB=yes],[HAVE_LIBUSB=no])
|
||||||
LIBS="$SAVE_LIBS"
|
|
||||||
CFLAGS="$SAVE_CFLAGS"
|
|
||||||
if [[ "$HAVE_LIBUSB" = "yes" ]]; then
|
if [[ "$HAVE_LIBUSB" = "yes" ]]; then
|
||||||
LIBUSB_INC="-I$ac_cv_use_libusb/include/libusb-1.0"
|
LIBUSB_INC="-I$ac_cv_use_libusb/include/libusb-1.0"
|
||||||
LIBUSB_LIB="-lusb-1.0"
|
LIBUSB_LIB="-lusb-1.0"
|
||||||
|
AC_TRY_LINK([#include <libusb.h>],[libusb_get_version();],[LIBUSB_INC="-DHAVE_LIBUSB_VER $LIBUSB_INC"])
|
||||||
fi
|
fi
|
||||||
|
LIBS="$SAVE_LIBS"
|
||||||
|
CFLAGS="$SAVE_CFLAGS"
|
||||||
fi
|
fi
|
||||||
AC_MSG_RESULT([$HAVE_LIBUSB])
|
AC_MSG_RESULT([$HAVE_LIBUSB])
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -6388,12 +6388,16 @@ BrfModule::BrfModule()
|
||||||
m_ifaceId(0)
|
m_ifaceId(0)
|
||||||
{
|
{
|
||||||
String tmp;
|
String tmp;
|
||||||
|
#ifdef HAVE_LIBUSB_VER
|
||||||
const libusb_version* ver = ::libusb_get_version();
|
const libusb_version* ver = ::libusb_get_version();
|
||||||
tmp.printf(" using libusb %u.%u.%u.%u",ver->major,ver->minor,ver->micro,ver->nano);
|
tmp.printf(" using libusb %u.%u.%u.%u",ver->major,ver->minor,ver->micro,ver->nano);
|
||||||
if (!TelEngine::null(ver->rc))
|
if (!TelEngine::null(ver->rc))
|
||||||
tmp << " rc='" << ver->rc << "'";
|
tmp << " rc='" << ver->rc << "'";
|
||||||
if (!TelEngine::null(ver->describe))
|
if (!TelEngine::null(ver->describe))
|
||||||
tmp << " desc='" << ver->describe << "'";
|
tmp << " desc='" << ver->describe << "'";
|
||||||
|
#else
|
||||||
|
tmp = " using old libusb 1.0";
|
||||||
|
#endif
|
||||||
Output("Loaded module BladeRF%s",tmp.safe());
|
Output("Loaded module BladeRF%s",tmp.safe());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue