BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump minimum libusb version to 1.0.16 

This gets us the libusb version checking mechanism itself, hopefully
making this sort of thing easier in future.

Also hotplug, device tree traversal, and lots of fixes.
This commit is contained in:
Bert Vermeulen 2013-12-19 10:45:36 +01:00
parent 95ecc76546
commit 17e9317b24
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -37,7 +37,7 @@ Requirements
- libglib >= 2.32.0 - libglib >= 2.32.0
- libzip >= 0.10 - libzip >= 0.10
- libserialport >= 0.1.0 (optional, used by some drivers) - libserialport >= 0.1.0 (optional, used by some drivers)
- libusb-1.0 >= 1.0.9 (optional, used by some drivers) - libusb-1.0 >= 1.0.16 (optional, used by some drivers)
- libftdi >= 0.16 (optional, used by some drivers) - libftdi >= 0.16 (optional, used by some drivers)
- libudev >= 151 (optional, used by some drivers) - libudev >= 151 (optional, used by some drivers)
- libasound / alsa-lib >= 1.0 (optional, only used by the alsa driver) - libasound / alsa-lib >= 1.0 (optional, only used by the alsa driver)

4
configure.ac
View File

@ -300,7 +300,7 @@ case "$host" in
[Specifies whether we have a libusb.h header.]) [Specifies whether we have a libusb.h header.])
;; ;;
*) *)
PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16],
[have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS"; [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS";
LIBS="$LIBS $libusb_LIBS"; LIBS="$LIBS $libusb_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"], SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
@ -604,7 +604,7 @@ echo "Detected libraries:"
echo echo
# Note: This only works for libs with pkg-config integration. # Note: This only works for libs with pkg-config integration.
for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "libusb-1.0 >= 1.0.9" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do
if `$PKG_CONFIG --exists $lib`; then if `$PKG_CONFIG --exists $lib`; then
ver=`$PKG_CONFIG --modversion $lib` ver=`$PKG_CONFIG --modversion $lib`
answer="yes ($ver)" answer="yes ($ver)"