From: Bert Vermeulen <redacted>
Date: Thu, 19 Dec 2013 09:45:36 +0000 (+0100)
Subject: Bump minimum libusb version to 1.0.16
X-Git-Tag: libsigrok-0.3.0~423
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=17e9317b247844ac09539a20e76e9e2548d64b13;p=libsigrok.git

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.
---

diff --git a/README b/README
index e12f89ed..124c33f0 100644
--- a/README
+++ b/README
@@ -37,7 +37,7 @@ Requirements
  - libglib >= 2.32.0
  - libzip >= 0.10
  - 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)
  - libudev >= 151 (optional, used by some drivers)
  - libasound / alsa-lib >= 1.0 (optional, only used by the alsa driver)
diff --git a/configure.ac b/configure.ac
index 341873a0..a5215ed0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,7 +300,7 @@ case "$host" in
 		[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";
 		LIBS="$LIBS $libusb_LIBS";
 		SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
@@ -604,7 +604,7 @@ echo "Detected libraries:"
 echo
 
 # 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
 		ver=`$PKG_CONFIG --modversion $lib`
 		answer="yes ($ver)"