From: Uwe Hermann <redacted>
Date: Fri, 12 Apr 2013 16:47:06 +0000 (+0200)
Subject: Bump glib requirement to >= 2.32.0.
X-Git-Tag: dsupstream~166
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=406569ddeadbbbc73c9fefb92b855e03fc107987;p=libsigrok.git

Bump glib requirement to >= 2.32.0.

This is now required, e.g. due to the usage of g_variant_new_fixed_array().
---

diff --git a/README b/README
index 3c407ae2..a47a3953 100644
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ Requirements
  - automake >= 1.11
  - libtool
  - pkg-config >= 0.22
- - libglib >= 2.28.0
+ - libglib >= 2.32.0
  - libzip >= 0.8
  - libusb-1.0 >= 1.0.9 (optional, used by most drivers)
  - libftdi >= 0.16 (optional, used by some drivers)
diff --git a/configure.ac b/configure.ac
index e3fd7175..0b333801 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,8 @@ SR_PKGLIBS=""
 
 # libglib-2.0 is always needed. Abort if it's not found.
 # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement).
-AM_PATH_GLIB_2_0([2.28.0],
+# We require at least 2.32.0 due to e.g. g_variant_new_fixed_array().
+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.
@@ -467,7 +468,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.28.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.8" "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)"