From: Uwe Hermann <redacted>
Date: Wed, 16 Oct 2013 16:10:29 +0000 (+0200)
Subject: Bump libzip requirement to >= 0.10.
X-Git-Tag: libsigrok-0.2.2~40
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8819bf5a960c37561e2bbbffa2685ec477938083;p=libsigrok.git

Bump libzip requirement to >= 0.10.

We now use zip_int64_t and zip_get_num_entries() for example, which
requires at least libzip 0.10. This version was released in 03/2012,
which is old enough that we don't necessarily have to do a work-around
for older versions. Thus, simply bump the requirement to >= 0.10.
---

diff --git a/README b/README
index 0e74f7b0..ca3401c1 100644
--- a/README
+++ b/README
@@ -35,7 +35,7 @@ Requirements
  - libtool
  - pkg-config >= 0.22
  - libglib >= 2.32.0
- - libzip >= 0.8
+ - libzip >= 0.10
  - libusb-1.0 >= 1.0.9 (optional, used by most drivers)
  - libftdi >= 0.16 (optional, used by some drivers)
  - libudev >= 151 (optional, used by some drivers)
diff --git a/configure.ac b/configure.ac
index 1cfd9051..98fa39e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,7 +237,7 @@ AM_PATH_GLIB_2_0([2.32.0],
 	[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libzip is always needed. Abort if it's not found.
-PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
+PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
 	[CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
 	SR_PKGLIBS="$SR_PKGLIBS libzip"])
 
@@ -539,7 +539,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.8" "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" "libusb-1.0 >= 1.0.9" "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)"