Bump glib requirement to >= 2.32.0.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9e52c712c203d2ad1a46394699ea2c3a415dce2a..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,
@@ -263,6 +264,21 @@ PKG_CHECK_MODULES([check], [check >= 0.9.4],
        LIBS="$LIBS $check_LIBS"], [have_check="no"])
 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 "$host" in
+*linux*)
+       # Do nothing. Whether the driver is enabled is determined by the
+       # previous --enable-all-drivers/--disable-all-drivers and/or any
+       # --enable-rigol-ds1xx2/--disable-rigol-ds1xx2 options.
+       ;;
+*)
+       # Disable the driver for builds that don't target Linux.
+       HW_RIGOL_DS1XX2="no"
+       ;;
+esac
+
 AC_SUBST(SR_PKGLIBS)
 
 # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers.
@@ -284,7 +300,7 @@ fi
 
 AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes)
 if test "x$HW_BRYMEN_DMM" = "xyes"; then
-       AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [brymen-dmm support])
+       AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support])
 fi
 
 AM_CONDITIONAL(LA_CHRONOVU_LA8, test x$LA_CHRONOVU_LA8 = xyes)
@@ -364,7 +380,7 @@ fi
 
 AM_CONDITIONAL(HW_VICTOR_DMM, test x$HW_VICTOR_DMM = xyes)
 if test "x$HW_VICTOR_DMM" = "xyes"; then
-       AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [victor-dmm support])
+       AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [Victor DMM support])
 fi
 
 AM_CONDITIONAL(LA_ZEROPLUS_LOGIC_CUBE, test x$LA_ZEROPLUS_LOGIC_CUBE = xyes)
@@ -445,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)"
@@ -461,26 +479,26 @@ for lib in "glib-2.0" "libzip" "libusb-1.0" "libftdi" "libudev" "alsa" "check";
 done
 
 echo -e "\nEnabled hardware drivers:\n"
-echo "  - Agilent DMM..................... $HW_AGILENT_DMM"
-echo "  - ALSA............................ $HW_ALSA"
-echo "  - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
-echo "  - Brymen DMM...................... $HW_BRYMEN_DMM"
-echo "  - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
-echo "  - Colead SLM...................... $HW_COLEAD_SLM"
-echo "  - Demo driver..................... $LA_DEMO"
-echo "  - Fluke DMM....................... $HW_FLUKE_DMM"
-echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
-echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
-echo "  - Lascar EL-USB................... $HW_LASCAR_EL_USB"
-echo "  - Link MSO-19..................... $LA_LINK_MSO19"
-echo "  - MIC 985xx....................... $HW_MIC_985XX"
-echo "  - Nexus Osciprime................. $HW_NEXUS_OSCIPRIME"
-echo "  - Openbench Logic Sniffer......... $LA_OLS"
-echo "  - Rigol DS1xx2.................... $HW_RIGOL_DS1XX2"
-echo "  - Serial DMM...................... $HW_SERIAL_DMM"
-echo "  - Tondaj SL-814................... $HW_TONDAJ_SL_814"
-echo "  - UNI-T DMM....................... $HW_UNI_T_DMM"
-echo "  - Victor DMM...................... $HW_VICTOR_DMM"
-echo "  - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
+echo "  - agilent-dmm..................... $HW_AGILENT_DMM"
+echo "  - alsa............................ $HW_ALSA"
+echo "  - asix-sigma...................... $LA_ASIX_SIGMA"
+echo "  - brymen-dmm...................... $HW_BRYMEN_DMM"
+echo "  - chronovu-la8.................... $LA_CHRONOVU_LA8"
+echo "  - colead-slm...................... $HW_COLEAD_SLM"
+echo "  - demo............................ $LA_DEMO"
+echo "  - fluke-dmm....................... $HW_FLUKE_DMM"
+echo "  - fx2lafw......................... $LA_FX2LAFW"
+echo "  - hantek-dso...................... $HW_HANTEK_DSO"
+echo "  - lascar-el-usb................... $HW_LASCAR_EL_USB"
+echo "  - link-mso19...................... $LA_LINK_MSO19"
+echo "  - mic-985xx....................... $HW_MIC_985XX"
+echo "  - nexus-osciprime................. $HW_NEXUS_OSCIPRIME"
+echo "  - openbench-logic-sniffer......... $LA_OLS"
+echo "  - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
+echo "  - serial-dmm...................... $HW_SERIAL_DMM"
+echo "  - tondaj-sl-814................... $HW_TONDAJ_SL_814"
+echo "  - uni-t-dmm....................... $HW_UNI_T_DMM"
+echo "  - victor-dmm...................... $HW_VICTOR_DMM"
+echo "  - zeroplus-logic-cube............. $LA_ZEROPLUS_LOGIC_CUBE"
 echo