X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=e5d5ce8c6f56392e02f8e6965255a2fede2b41dc;hb=382bea8250c8f69fff2f6b947a6ad0d884328610;hp=0380534ae3282462d4e76c0e8df35553a4d336b5;hpb=896fc9c7231c7567cda84404eb0fcdd889b556a2;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 0380534a..e5d5ce8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,7 +223,7 @@ SR_DRIVER([Brymen BM86x], [brymen-bm86x], [libusb])
 SR_DRIVER([Brymen DMM], [brymen-dmm], [libserialport])
 SR_DRIVER([CEM DT-885x], [cem-dt-885x], [libserialport])
 SR_DRIVER([Center 3xx], [center-3xx], [libserialport])
-SR_DRIVER([ChronoVu LA], [chronovu-la], [libftdi])
+SR_DRIVER([ChronoVu LA], [chronovu-la], [libusb libftdi])
 SR_DRIVER([Colead SLM], [colead-slm], [libserialport])
 SR_DRIVER([Conrad DIGI 35 CPU], [conrad-digi-35-cpu], [libserialport])
 SR_DRIVER([DER EE DE-5000], [deree-de5000], [libserialport])
@@ -335,9 +335,18 @@ AS_IF([test "x$BINDINGS_CXX" = xyes],
 	[sr_python_missing=],
 	[sr_python_missing='C++ bindings'])
 
-# The Python bindings need Python development files.
+# Extract major and minor version number of the Python interpreter.
+sr_pymajor=${PYTHON_VERSION%%.*}
+sr_pyminor=${PYTHON_VERSION#*.}
+
+# The Python bindings need Python development files. Check for either
+# Python 3 or Python 2 headers depending on the interpreter version.
 SR_PKG_CHECK([python_dev], [SR_PKGLIBS_PYTHON],
-	[python >= 2.7], [python2 >= 2.7], [python27 >= 2.7])
+	[python = $PYTHON_VERSION],
+	[python$sr_pymajor = $PYTHON_VERSION],
+	[python$sr_pymajor$sr_pyminor = $PYTHON_VERSION],
+	[python-$PYTHON_VERSION = $PYTHON_VERSION])
+
 AS_IF([test "x$sr_have_python_dev" != xyes],
 	[SR_APPEND([sr_python_missing], [', '], [Headers])])
 
@@ -431,7 +440,7 @@ AM_CONDITIONAL([BINDINGS_JAVA], [test "x$BINDINGS_JAVA" = xyes])
 ##############################
 
 # Add mandatory dependencies to module list.
-SR_APPEND([SR_PKGLIBS], ['libzip >= 0.11'])
+SR_APPEND([SR_PKGLIBS], ['libzip >= 0.10'])
 AC_SUBST([SR_PKGLIBS])
 
 # Retrieve the compile and link flags for all modules combined.
@@ -449,11 +458,16 @@ AM_COND_IF([BINDINGS_CXX], [
 # Check for specific libusb features, now that we know the CFLAGS.
 AC_LANG([C])
 sr_save_cflags=$CFLAGS
+sr_save_libs=$LIBS
 CFLAGS="$LIBSIGROK_CFLAGS $CFLAGS"
+LIBS="$LIBSIGROK_LIBS $LIBS"
 AC_CHECK_TYPES([libusb_os_handle],
 	[sr_have_libusb_os_handle=yes], [sr_have_libusb_os_handle=no],
 	[[#include <libusb.h>]])
+AC_CHECK_FUNCS([zip_discard])
+LIBS=$sr_save_libs
 CFLAGS=$sr_save_cflags
+
 AM_COND_IF([NEED_USB], [AS_CASE([$sr_have_libusb_os_handle:$host_os], [no:mingw*],
 	[AC_MSG_ERROR([Windows builds require the event-abstraction branch of libusb])])])
 
@@ -499,7 +513,7 @@ Compile configuration:
 
 Detected libraries (required):
  - glib-2.0 >= 2.32.0.............. $sr_glib_version
- - libzip >= 0.11.................. $sr_libzip_version
+ - libzip >= 0.10.................. $sr_libzip_version
 
 Detected libraries (optional):
 $sr_pkglibs_summary