X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=2f9b06f097c006a10891b62450f9a2b1eb7817cc;hb=a6dc3dacab23bf7c8da008f21a03e2a1242e77ea;hp=370675c755297f8e162c6407eead5ba498174dcb;hpb=e75ee7de25d52356ba7cc44b7141b24283e49d1a;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 370675c7..2f9b06f0 100644 --- a/configure.ac +++ b/configure.ac @@ -239,7 +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]) +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]) @@ -449,11 +449,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 ]]) +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])])])