Bump glib requirement to >= 2.32.0.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7be2dfff9dd143ae265de482fa2ba0ef386178cc..0b3338011d69fe8caa2b95748ae96c8c0cdb81b3 100644 (file)
--- 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.
@@ -209,7 +210,7 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
 
 # libusb-1.0 is only needed for some hardware drivers. Disable the respective
 # drivers if it is not found.
-case "$build" in
+case "$host" in
 *freebsd*)
        # FreeBSD comes with an "integrated" libusb-1.0-style USB API.
        # This means libusb-1.0 is always available, no need to check for it,
@@ -266,7 +267,7 @@ AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 # The Rigol DS1xx2 driver currently uses the Linux kernel usbtmc module
 # (though it is planned to rewrite the driver to be portable later).
 # Thus, it will be disabled for non-Linux builds for now.
-case "$build" in
+case "$host" in
 *linux*)
        # Do nothing. Whether the driver is enabled is determined by the
        # previous --enable-all-drivers/--disable-all-drivers and/or any
@@ -460,12 +461,14 @@ echo
 echo "  - Package version (major.minor.micro):    $SR_PACKAGE_VERSION"
 echo "  - Library version (current:revision:age): $SR_LIB_VERSION"
 echo "  - Prefix: $prefix"
+echo "  - Building on: $build"
+echo "  - Building for: $host"
 echo
 echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0" "libzip" "libusb-1.0" "libftdi" "libudev" "alsa" "check"; 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)"