sigrok.m4: Add SR_PROG_VERSION macro

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e88e5e493acc11b22902f78f24b5a3aff020cbe4..16056c2b0f525904d25886e78ae5e0a798cd4729 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,10 +92,15 @@ SR_ARG_OPT_PKG([libftdi], [LIBFTDI],,
 
 # 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.
-AS_CASE([$host], [*freebsd*], [sr_have_libusb=yes])
+# On Windows, require the latest version we can get our hands on,
+# until the new generic event handling has seen an official release.
+AS_CASE([$host_os],
+       [freebsd*], [sr_libusb_req='libusb-1.0' sr_have_libusb=yes],
+       [mingw*], [sr_libusb_req='libusb-1.0 >= 1.0.20'],
+       [sr_libusb_req='libusb-1.0 >= 1.0.16'])
 
 SR_ARG_OPT_PKG([libusb], [LIBUSB_1_0], [NEED_USB],
-       [libusb-1.0 >= 1.0.16])
+       [$sr_libusb_req])
 
 SR_ARG_OPT_PKG([librevisa], [LIBREVISA], [NEED_VISA],
        [librevisa >= 0.0.20130412])
@@ -109,7 +114,7 @@ SR_ARG_OPT_CHECK([libieee1284], [LIBIEEE1284],, [
        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ieee1284.h>]],
                                [[(void) ieee1284_open(0, 0, 0);]])],
                [sr_have_libieee1284=yes], [sr_have_libieee1284=no])
-       sr_save_LIBS=$LIBS
+       LIBS=$sr_save_LIBS
 ])
 AS_IF([test "x$sr_have_libieee1284" = xyes],
        [SR_PREPEND([SR_EXTRA_LIBS], [-lieee1284])])
@@ -421,6 +426,18 @@ AM_COND_IF([BINDINGS_CXX], [
        PKG_CHECK_MODULES([LIBSIGROKCXX], [$SR_PKGLIBS_CXX])
        PKG_CHECK_MODULES([PYSIGROK], [$SR_PKGLIBS_PYTHON $SR_PKGLIBS_CXX])
 ])
+
+# Check for specific libusb features, now that we know the CFLAGS.
+AC_LANG([C])
+sr_save_cflags=$CFLAGS
+CFLAGS="$LIBSIGROK_CFLAGS $CFLAGS"
+AC_CHECK_TYPES([libusb_os_handle],
+       [sr_have_libusb_os_handle=yes], [sr_have_libusb_os_handle=no],
+       [[#include <libusb.h>]])
+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])])])
+
 sr_glib_version=`$PKG_CONFIG --modversion glib-2.0 2>&AS_MESSAGE_LOG_FD`
 sr_libzip_version=`$PKG_CONFIG --modversion libzip 2>&AS_MESSAGE_LOG_FD`