build: Require libzip 0.11

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d773d7f201cf674055f61195b6b27236fb7f8820..0380534ae3282462d4e76c0e8df35553a4d336b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,8 @@ SR_PKG_VERSION_SET([SR_PACKAGE_VERSION], [AC_PACKAGE_VERSION])
 # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
 SR_LIB_VERSION_SET([SR_LIB_VERSION], [2:0:0])
 
+AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"])
+
 #############################
 ##  Optional dependencies  ##
 #############################
@@ -229,6 +231,7 @@ SR_DRIVER([demo], [demo])
 SR_DRIVER([Fluke DMM], [fluke-dmm], [libserialport])
 SR_DRIVER([fx2lafw], [fx2lafw], [libusb])
 SR_DRIVER([GMC MH 1x/2x], [gmc-mh-1x-2x], [libserialport])
+SR_DRIVER([GW Instek GDS-800], [gwinstek-gds-800], [libserialport])
 SR_DRIVER([Hameg HMO], [hameg-hmo], [libserialport])
 SR_DRIVER([Hantek DSO], [hantek-dso], [libusb])
 SR_DRIVER([Hung-Chang DSO-2100], [hung-chang-dso-2100], [libieee1284])
@@ -236,6 +239,7 @@ SR_DRIVER([Ikalogic Scanalogic-2], [ikalogic-scanalogic2], [libusb])
 SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus], [libftdi])
 SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb])
 SR_DRIVER([KERN scale], [kern-scale], [libserialport])
+SR_DRIVER([Korad KDxxxxP], [korad-kdxxxxp], [libserialport])
 SR_DRIVER([Lascar EL-USB], [lascar-el-usb], [libusb])
 SR_DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx], [libserialport])
 SR_DRIVER([maynuo-m97], [maynuo-m97])
@@ -346,15 +350,22 @@ PKG_CHECK_EXISTS([pygobject-3.0 < 3.7.91],
        [AC_DEFINE([PYGOBJECT_FLAGS_SIGNED], [1],
                [Whether last argument to pyg_flags_get_value() is signed.])])
 
-# The Python bindings need the setuptools Python module.
-# We'll let it go through even if the AX macro wasn't found,
-# as the Python module may still be there.
-HAVE_PYMOD_SETUPTOOLS=yes
-m4_ifdef([AX_PYTHON_MODULE],
-       [AX_PYTHON_MODULE([setuptools])],
-       [m4_warn([unsupported], [Missing macro AX_PYTHON_MODULE: no setuptools check])])
+# The Python bindings need the setuptools and numpy Python modules.
+# We'll let it go through even if the AX macro wasn't found, as the
+# Python modules may still be there.
+m4_ifdef([AX_PYTHON_MODULE], [
+       AX_PYTHON_MODULE([setuptools])
+       AX_PYTHON_MODULE([numpy])
+], [
+       HAVE_PYMOD_SETUPTOOLS=yes
+       HAVE_PYMOD_NUMPY=yes
+       m4_warn([unsupported],
+               [Missing macro AX_PYTHON_MODULE: no check for setuptools and numpy])
+])
 AS_IF([test "x$HAVE_PYMOD_SETUPTOOLS" != xyes],
        [SR_APPEND([sr_python_missing], [', '], [setuptools])])
+AS_IF([test "x$HAVE_PYMOD_NUMPY" != xyes],
+       [SR_APPEND([sr_python_missing], [', '], [numpy])])
 
 # The Python bindings use SWIG to generate code.
 AC_CHECK_PROGS([SWIG], [swig swig3.0 swig2.0])
@@ -420,7 +431,7 @@ AM_CONDITIONAL([BINDINGS_JAVA], [test "x$BINDINGS_JAVA" = xyes])
 ##############################
 
 # Add mandatory dependencies to module list.
-SR_APPEND([SR_PKGLIBS], ['libzip >= 0.10'])
+SR_APPEND([SR_PKGLIBS], ['libzip >= 0.11'])
 AC_SUBST([SR_PKGLIBS])
 
 # Retrieve the compile and link flags for all modules combined.
@@ -488,7 +499,7 @@ Compile configuration:
 
 Detected libraries (required):
  - glib-2.0 >= 2.32.0.............. $sr_glib_version
- - libzip >= 0.10.................. $sr_libzip_version
+ - libzip >= 0.11.................. $sr_libzip_version
 
 Detected libraries (optional):
 $sr_pkglibs_summary