]> sigrok.org Git - libsigrok.git/blobdiff - configure.ac
added pipistrello-ols
[libsigrok.git] / configure.ac
index 1d5c0b3186027b67756187073e4df2b54d0fe65e..d5a9e896f880e60165159964dda744c5885fb60f 100644 (file)
@@ -23,7 +23,7 @@ AC_PREREQ([2.63])
 
 # libsigrok package version number (NOT the same as shared lib version!).
 m4_define([sr_package_version_major], [0])
-m4_define([sr_package_version_minor], [2])
+m4_define([sr_package_version_minor], [3])
 m4_define([sr_package_version_micro], [0])
 m4_define([sr_package_version], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro])
 
@@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
 # We require at least automake 1.11 (needed for 'silent rules').
-AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news color-tests])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
@@ -44,11 +44,14 @@ AH_BOTTOM([#endif /* SR_CONFIG_H */])
 
 # Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden
 # and enforce use of SR_API to explicitly mark all public API functions.
-CFLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden"
+COMMON_FLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden"
+CFLAGS="$COMMON_FLAGS -Wmissing-prototypes"
+CXXFLAGS="-std=c++11 $COMMON_FLAGS"
 
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
@@ -66,7 +69,7 @@ PKG_PROG_PKG_CONFIG([0.22])
 # Carefully read the libtool docs before updating these numbers!
 # The algorithm for determining which number to change (and how) is nontrivial!
 # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-SR_LIB_VERSION_CURRENT=1
+SR_LIB_VERSION_CURRENT=2
 SR_LIB_VERSION_REVISION=0
 SR_LIB_VERSION_AGE=0
 SR_LIB_VERSION="$SR_LIB_VERSION_CURRENT:$SR_LIB_VERSION_REVISION:$SR_LIB_VERSION_AGE"
@@ -77,136 +80,163 @@ AC_SUBST(SR_LIB_VERSION_AGE)
 AC_SUBST(SR_LIB_VERSION)
 AC_SUBST(SR_LIB_LDFLAGS)
 
-# Hardware support '--enable' options.
-
 AC_ARG_ENABLE(all-drivers, AC_HELP_STRING([--enable-all-drivers],
        [enable all drivers by default [default=yes]]),
        [HW_ENABLED_DEFAULT="$enableval"],
        [HW_ENABLED_DEFAULT="yes"])
 
-AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm],
-       [enable Agilent DMM support [default=yes]]),
-       [HW_AGILENT_DMM="$enableval"],
-       [HW_AGILENT_DMM=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
-       [enable ALSA driver support [default=yes]]),
-       [HW_ALSA="$enableval"],
-       [HW_ALSA=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
-       [enable ASIX SIGMA/SIGMA2 support [default=yes]]),
-       [HW_ASIX_SIGMA="$enableval"],
-       [HW_ASIX_SIGMA=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
-       [enable Brymen DMM support [default=yes]]),
-       [HW_BRYMEN_DMM="$enableval"],
-       [HW_BRYMEN_DMM=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(cem-dt-885x, AC_HELP_STRING([--enable-cem-dt-885x],
-       [enable CEM DT-885x support [default=yes]]),
-       [HW_CEM_DT_885X="$enableval"],
-       [HW_CEM_DT_885X=yes])
-
-AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
-       [enable ChronoVu LA8 support [default=yes]]),
-       [HW_CHRONOVU_LA8="$enableval"],
-       [HW_CHRONOVU_LA8=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm],
-       [enable Colead SLM support [default=yes]]),
-       [HW_COLEAD_SLM="$enableval"],
-       [HW_COLEAD_SLM=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo],
-       [enable demo driver support [default=yes]]),
-       [HW_DEMO="$enableval"],
-       [HW_DEMO=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm],
-       [enable Fluke DMM support [default=yes]]),
-       [HW_FLUKE_DMM="$enableval"],
-       [HW_FLUKE_DMM=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
-       [enable fx2lafw support (for FX2 LAs). [default=yes]]),
-       [HW_FX2LAFW="$enableval"],
-       [HW_FX2LAFW=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
-       [enable Hantek DSO support [default=yes]]),
-       [HW_HANTEK_DSO="$enableval"],
-       [HW_HANTEK_DSO=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(ikalogic-scanalogic2, AC_HELP_STRING([--enable-ikalogic-scanalogic2],
-       [enable IKALOGIC Scanalogic2 support [default=yes]]),
-       [HW_IKALOGIC_SCANALOGIC2="$enableval"],
-       [HW_IKALOGIC_SCANALOGIC2=yes])
-
-AC_ARG_ENABLE(ikalogic-scanaplus, AC_HELP_STRING([--enable-ikalogic-scanaplus],
-       [enable Ikalogic ScanaPLUS support [default=yes]]),
-       [HW_IKALOGIC_SCANAPLUS="$enableval"],
-       [HW_IKALOGIC_SCANAPLUS=yes])
-
-AC_ARG_ENABLE(kecheng-kc-330b, AC_HELP_STRING([--enable-kecheng-kc-330b],
-       [enable Kecheng KC-330B support [default=yes]]),
-       [HW_KECHENG_KC_330B="$enableval"],
-       [HW_KECHENG_KC_330B=yes])
-
-AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
-       [enable Lascar EL-USB support [default=yes]]),
-       [HW_LASCAR_EL_USB="$enableval"],
-       [HW_LASCAR_EL_USB=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
-       [enable Link Instruments MSO-19 support [default=no]]),
-       [HW_LINK_MSO19="$enableval"],
-       [HW_LINK_MSO19="no"])
-
-AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx],
-       [enable MIC 985xx support [default=yes]]),
-       [HW_MIC_985XX="$enableval"],
-       [HW_MIC_985XX=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols],
-       [enable OpenBench Logic Sniffer (OLS) support [default=yes]]),
-       [HW_OLS="$enableval"],
-       [HW_OLS=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2],
-       [enable Rigol DS1xx2 support [default=yes]]),
-       [HW_RIGOL_DS1XX2="$enableval"],
-       [HW_RIGOL_DS1XX2=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
-       [enable serial DMM support [default=yes]]),
-       [HW_SERIAL_DMM="$enableval"],
-       [HW_SERIAL_DMM=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(tondaj-sl-814, AC_HELP_STRING([--enable-tondaj-sl-814],
-       [enable Tondaj SL-814 support [default=yes]]),
-       [HW_TONDAJ_SL_814="$enableval"],
-       [HW_TONDAJ_SL_814=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(uni-t-dmm, AC_HELP_STRING([--enable-uni-t-dmm],
-       [enable UNI-T DMM support [default=yes]]),
-       [HW_UNI_T_DMM="$enableval"],
-       [HW_UNI_T_DMM=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm],
-       [enable victor-dmm support [default=yes]]),
-       [HW_VICTOR_DMM="$enableval"],
-       [HW_VICTOR_DMM=$HW_ENABLED_DEFAULT])
-
-AC_ARG_ENABLE(zeroplus-logic-cube,
-       AC_HELP_STRING([--enable-zeroplus-logic-cube],
-       [enable ZEROPLUS Logic Cube support [default=yes]]),
-       [HW_ZEROPLUS_LOGIC_CUBE="$enableval"],
-       [HW_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT])
+# Usage: DRIVER([Device name], [driver-name])
+# An optional third argument [no] disables that driver.
+m4_define([driverize], [m4_tolower(m4_bpatsubst([$1], [[^0-9a-zA-Z-]+], [-]))])
+m4_define([upperize], [m4_toupper(m4_bpatsubst([$1], [[^0-9a-zA-Z_]+], [_]))])
+AC_DEFUN([DRIVER], [
+       if test -z "$3"; then
+               default=$HW_ENABLED_DEFAULT
+       else
+               default="$3"
+       fi
+       AC_ARG_ENABLE($2, AC_HELP_STRING([--enable-$2], [enable $1 support]),
+               [m4_join([], [HW_], upperize([$2]))="$enableval"],
+               [m4_join([], [HW_], upperize([$2]))=$default])
+       dots=$(echo -n ".............................." | cut -c 1-$(expr 32 - $(echo -n $2|wc -c)))
+       driver_summary="${driver_summary}  - $2${dots} \${m4_join([], [HW_], upperize([$2]))}@"
+])
+
+DRIVER([Agilent DMM], [agilent-dmm])
+DRIVER([Appa 55II], [appa-55ii])
+DRIVER([ASIX SIGMA/SIGMA2], [asix-sigma])
+DRIVER([Atten PPS3xxx], [atten-pps3xxx])
+DRIVER([BeagleLogic], [beaglelogic])
+DRIVER([Brymen BM86x], [brymen-bm86x])
+DRIVER([Brymen DMM], [brymen-dmm])
+DRIVER([CEM DT-885x], [cem-dt-885x])
+DRIVER([Center 3xx], [center-3xx])
+DRIVER([ChronoVu LA], [chronovu-la])
+DRIVER([Colead SLM], [colead-slm])
+DRIVER([Conrad DIGI 35 CPU], [conrad-digi-35-cpu])
+DRIVER([demo], [demo])
+DRIVER([Fluke DMM], [fluke-dmm])
+DRIVER([fx2lafw], [fx2lafw])
+DRIVER([GMC MH 1x/2x], [gmc-mh-1x-2x])
+DRIVER([Hameg HMO], [hameg-hmo])
+DRIVER([Hantek DSO], [hantek-dso])
+DRIVER([Ikalogic Scanalogic-2], [ikalogic-scanalogic2])
+DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus])
+DRIVER([Kecheng KC-330B], [kecheng-kc-330b])
+DRIVER([Lascar EL-USB], [lascar-el-usb])
+DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx])
+DRIVER([MIC 985xx], [mic-985xx])
+DRIVER([Motech LPS 30x], [motech-lps-30x])
+DRIVER([Norma DMM], [norma-dmm])
+DRIVER([OpenBench Logic Sniffer], [openbench-logic-sniffer])
+DRIVER([Pipistrello-OLS], [pipistrello-ols])
+DRIVER([Rigol DS], [rigol-ds])
+DRIVER([Saleae Logic16], [saleae-logic16])
+DRIVER([serial DMM], [serial-dmm])
+DRIVER([Sysclk LWLA], [sysclk-lwla])
+DRIVER([Teleinfo], [teleinfo])
+DRIVER([Testo], [testo])
+DRIVER([Tondaj SL-814], [tondaj-sl-814])
+DRIVER([UNI-T DMM], [uni-t-dmm])
+DRIVER([UNI-T UT32x], [uni-t-ut32x])
+DRIVER([Victor DMM], [victor-dmm])
+DRIVER([ZEROPLUS Logic Cube], [zeroplus-logic-cube])
+
+AC_ARG_ENABLE(libserialport,
+       AC_HELP_STRING([--disable-libserialport],
+       [disable libserialport support [default=detect]]))
+
+AC_ARG_ENABLE(libftdi,
+       AC_HELP_STRING([--disable-libftdi],
+       [disable libftdi support [default=detect]]))
+
+AC_ARG_ENABLE(libusb,
+       AC_HELP_STRING([--disable-libusb],
+       [disable libusb support [default=detect]]))
+
+# Language binding '--enable' options
+
+AC_ARG_ENABLE(bindings,
+       AC_HELP_STRING([--enable-bindings],
+       [build language bindings [default=yes]]),
+       [BINDINGS_ALL="$enableval"], [BINDINGS_ALL="yes"])
+
+AC_ARG_ENABLE(cxx,
+       AC_HELP_STRING([--enable-cxx],
+       [build C++ bindings [default=yes]]),
+       [BINDINGS_CXX="$enableval"], [BINDINGS_CXX=$BINDINGS_ALL])
+
+AC_ARG_ENABLE(python,
+       AC_HELP_STRING([--enable-python],
+       [build Python bindings [default=yes]]),
+       [BINDINGS_PYTHON="$enableval"], [BINDINGS_PYTHON=$BINDINGS_ALL])
+
+AC_ARG_ENABLE(java,
+       AC_HELP_STRING([--enable-java],
+       [build Java bindings [default=yes]]),
+       [BINDINGS_JAVA="$enableval"], [BINDINGS_JAVA=$BINDINGS_ALL])
+
+AC_ARG_WITH(jni-include-path,
+       AC_HELP_STRING([--with-jni-include-path=path],
+       [specify include path for JNI [default=autodetect]]),
+       [JNI_INCLUDE_DIRS="$withval"], [JNI_INCLUDE_DIRS=auto])
+
+# Check if the C++ compiler supports the C++11 standard.
+
+m4_ifdef([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX_11(,[optional])],
+       [AC_MSG_NOTICE([Missing macro m4_toupper(aX_CXX_COMPILE_STDCXX_11), no C++11 check])])
+
+if test "x$HAVE_CXX11" != "x1"; then
+       BINDINGS_CXX="no"; cxx_msg="C++11 compiler required"
+fi
+
+# The C++ bindings use doxygen to parse libsigrok symbols.
+AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes])
+if test "x$HAVE_DOXYGEN" != "xyes"; then
+       BINDINGS_CXX="no"; cxx_msg="doxygen required"
+fi
+
+# Python is needed for the C++ bindings.
+AC_CHECK_PROG([HAVE_PYTHON], [python], [yes])
+if test "x$HAVE_PYTHON" != "xyes"; then
+       BINDINGS_CXX="no"; cxx_msg="Python required"
+fi
+
+# The Python bindings need Python development files
+PKG_CHECK_MODULES([python], [python >= 2.7],
+        [CXXFLAGS="$CXXFLAGS $python_CFLAGS";
+        CXXLIBS="$CXXLIBS $python_LIBS"],
+[PKG_CHECK_MODULES([python27], [python-2.7 >= 2.7],
+        [CXXFLAGS="$CXXFLAGS $python27_CFLAGS";
+        CXXLIBS="$CXXLIBS $python27_LIBS"],
+               [BINDINGS_PYTHON="no"; python_msg="Python headers required"])])
+
+# The Python bindings need the setuptools Python module.
+m4_ifdef([AX_PYTHON_MODULE], [AX_PYTHON_MODULE([setuptools])],
+       # We'll let it go through even if the macro wasn't found, the python
+       # module may still be there.
+       [HAVE_PYTHON_SETUPTOOLS="yes";
+               AC_MSG_NOTICE([Missing macro m4_toupper(aX_PYTHON_MODULE), no setuptools check])]
+)
+if test "x$HAVE_PYMOD_SETUPTOOLS" != "xyes"; then
+       BINDINGS_PYTHON="no"; python_msg="Python setuptools module required"
+fi
+
+# The Python and Java bindings use swig to generate code.
+AC_CHECK_PROG([HAVE_SWIG], [swig], [yes])
+if test "x$HAVE_SWIG" != "xyes"; then
+       BINDINGS_PYTHON="no"; python_msg="swig required"
+       BINDINGS_JAVA="no"; java_msg="swig required"
+fi
 
 # Checks for libraries.
 
+case "$host" in
+*mingw*)
+       # We need to link against the Winsock2 library for SCPI over TCP.
+       LIBS="$LIBS -lws2_32";;
+esac
+
 # This variable collects the pkg-config names of all detected libs.
 # It is then used to construct the "Requires.private:" field in the
 # libsigrok.pc file.
@@ -215,91 +245,207 @@ SR_PKGLIBS=""
 # libm (the standard math library) is always needed.
 AC_SEARCH_LIBS([pow], [m])
 
+# RPC is only needed for VXI support.
+AC_MSG_CHECKING([for RPC support])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <rpc/rpc.h>],
+                               [CLIENT *rpc_test(void)],
+                               [{ return clnt_create("", 0, 0, ""); }])],
+              [AC_MSG_RESULT([yes]); have_rpc=1],
+              [AC_MSG_RESULT([no]);  have_rpc=0])
+# Define HAVE_RPC in config.h if we found RPC support.
+AC_DEFINE_UNQUOTED(HAVE_RPC, [$have_rpc], [Specifies whether we have RPC support.])
+# VXI support is only compiled if RPC support was found.
+AM_CONDITIONAL(NEED_RPC, test "x$have_rpc" != "x0")
+
 # 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).
 # 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"])
+       [LIB_CFLAGS="$LIB_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libzip is always needed. Abort if it's not found.
-PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
-       [CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
+PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
+       [LIB_CFLAGS="$LIB_CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS libzip"])
 
+# libserialport is only needed for some hardware drivers. Disable the
+# respective drivers if it is not found.
+if test "x$enable_libserialport" != "xno"; then
+       PKG_CHECK_MODULES([libserialport], [libserialport >= 0.2.0],
+               [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS";
+               LIBS="$LIBS $libserialport_LIBS";
+               SR_PKGLIBS="$SR_PKGLIBS libserialport"],
+               [have_libserialport="no"])
+       if test "x$enable_libserialport$have_libserialport" = "xyesno"; then
+               AC_MSG_ERROR([libserialport support requested, but it was not found])
+       fi
+else
+       have_libserialport="no"
+fi
+
+# Define HAVE_LIBSERIALPORT in config.h if we found libserialport.
+if test "x$have_libserialport" = "xno"; then
+       HW_AGILENT_DMM="no"; HW_APPA_55II="no";
+       HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no";
+       HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_CONRAD_DIGI_35_CPU="no";
+       HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no";
+       HW_MANSON_HCS_3XXX="no"; HW_MIC_985XX="no"; HW_MOTECH_LPS_30X="no";
+       HW_NORMA_DMM="no"; HW_OPENBENCH_LOGIC_SNIFFER="no"; HW_SERIAL_DMM="no";
+       HW_TELEINFO="no"; HW_TONDAJ_SL_814="no";
+else
+       AC_DEFINE_UNQUOTED(HAVE_LIBSERIALPORT, [1],
+               [Specifies whether we have libserialport.])
+fi
+
+# Serial port helper code is only compiled in if libserialport was found.
+AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno)
+
+PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812],
+       [have_librevisa="yes"; LIB_CFLAGS="$LIB_CFLAGS $librevisa_CFLAGS";
+       LIBS="$LIBS $librevisa_LIBS";
+       SR_PKGLIBS="$SR_PKGLIBS librevisa"],
+       [have_librevisa="no"])
+
+# VISA SCPI backend is only compiled in if librevisa was found.
+AM_CONDITIONAL(NEED_VISA, test "x$have_librevisa" != xno)
+
+# Define HAVE_LIBREVISA in config.h if we found librevisa.
+if test "x$have_librevisa" != "xno"; then
+       AC_DEFINE_UNQUOTED(HAVE_LIBREVISA, [1],
+               [Specifies whether we have librevisa.])
+fi
+
 # libusb-1.0 is only needed for some hardware drivers. Disable the respective
 # drivers if it is not found.
-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,
-       # and no need to (potentially) disable any drivers if it's not found.
+if test "x$enable_libusb" != "xno"; then
+       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,
+               # and no need to (potentially) disable any drivers if it's not found.
+               have_libusb1_0="yes"
+               ;;
+       *)
+               PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16],
+                       [have_libusb1_0="yes"; LIB_CFLAGS="$LIB_CFLAGS $libusb_CFLAGS";
+                       LIBS="$LIBS $libusb_LIBS";
+                       SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
+                       [have_libusb1_0="no"])
+               if test "x$enable_libusb$have_libusb1_0" = "xyesno"; then
+                       AC_MSG_ERROR([libusb support requested, but it was not found])
+               fi
+               ;;
+       esac
+else
+       have_libusb1_0="no"
+fi
+
+# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
+if test "x$have_libusb1_0" = "xno"; then
+       HW_BRYMEN_BM86X="no"; HW_FX2LAFW="no";
+       HW_HANTEK_DSO="no"; HW_IKALOGIC_SCANALOGIC2="no";
+       HW_KECHENG_KC_330B="no"; HW_LASCAR_EL_USB="no";
+       HW_SYSCLK_LWLA="no"; HW_TESTO="no"; HW_UNI_T_DMM="no";
+       HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no";
+       HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no";
+else
        AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
                [Specifies whether we have a libusb.h header.])
-       ;;
-*)
-       PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
-               [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS";
-               LIBS="$LIBS $libusb_LIBS";
-               SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
-               [have_libusb1_0="no"; HW_FX2LAFW="no"; HW_HANTEK_DSO="no";
-               HW_IKALOGIC_SCANALOGIC2="no"; HW_KECHENG_KC_330B="no";
-               HW_LASCAR_EL_USB="no";
-               HW_UNI_T_DMM="no"; HW_VICTOR_DMM="no";
-               HW_ZEROPLUS_LOGIC_CUBE="no"])
-
-       # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
-       if test "x$have_libusb1_0" != "xno"; then
-               AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
-                       [Specifies whether we have a libusb.h header.])
-       fi
-       ;;
-esac
+fi
 
 # USB + FX2 firmware helper code is only compiled in if libusb-1.0 was found.
 AM_CONDITIONAL(NEED_USB, test "x$have_libusb1_0" != xno)
 
 # libftdi is only needed for some hardware drivers. Disable them if not found.
-PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
-       [CFLAGS="$CFLAGS $libftdi_CFLAGS";
-       LIBS="$LIBS $libftdi_LIBS";
-       SR_PKGLIBS="$SR_PKGLIBS libftdi"],
-       [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="no"; HW_IKALOGIC_SCANAPLUS="no"])
-
-# libudev is only needed for some hardware drivers. Disable them if not found.
-PKG_CHECK_MODULES([libudev], [libudev >= 151],
-       [CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
-       SR_PKGLIBS="$SR_PKGLIBS libudev"],
-       [HW_LINK_MSO19="no"])
-
-# ALSA is only needed for some hardware drivers. Disable them if not found.
-PKG_CHECK_MODULES([alsa], [alsa >= 1.0],
-       [CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS";
-       SR_PKGLIBS="$SR_PKGLIBS alsa"],
-       [HW_ALSA="no"])
+if test "x$enable_libftdi" != "xno"; then
+       PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
+               [have_libftdi="yes"; LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS";
+               LIBS="$LIBS $libftdi_LIBS";
+               SR_PKGLIBS="$SR_PKGLIBS libftdi"],
+               [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.0],
+                       [LIB_CFLAGS="$LIB_CFLAGS $libftdi1_CFLAGS";
+                       LIBS="$LIBS $libftdi1_LIBS";
+                       SR_PKGLIBS="$SR_PKGLIBS libftdi1"],
+                       [have_libftdi="no"])])
+       if test "x$enable_libftdi$have_libftdi" = "xyesno"; then
+               AC_MSG_ERROR([libftdi support requested, but it was not found])
+       fi
+else
+       have_libftdi="no"
+fi
+
+if test "x$have_libftdi" = "xno"; then
+       HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no";
+       HW_PIPISTRELLO_OLS="no";
+fi
+
+# glibmm-2.4 is needed for the C++ bindings.
+PKG_CHECK_MODULES([glibmm], [glibmm-2.4 >= 2.32.0],
+       [CXXFLAGS="$CXXFLAGS $glibmm_CFLAGS";
+       CXXLIBS="$CXXLIBS $glibmm_LIBS"],
+       [BINDINGS_CXX="no"; cxx_msg="glibmm required"])
+
+# PyGObject is needed for the Python bindings.
+PKG_CHECK_MODULES([pygobject], [pygobject-3.0 >= 3.0.0],
+        [CXXFLAGS="$CXXFLAGS $pygobject_CFLAGS";
+        CXXLIBS="$CXXLIBS $pygobject_LIBS";
+       PKG_CHECK_MODULES([pygobject_3_7_91], [pygobject-3.0 >= 3.7.91],
+               [pyg_flags_signed=0], [pyg_flags_signed=1]);
+       AC_DEFINE_UNQUOTED(PYGOBJECT_FLAGS_SIGNED, [$pyg_flags_signed],
+               [Whether last argument to pyg_flags_get_value() is signed])],
+       [BINDINGS_PYTHON="no"; python_msg="Python pygobject module required"])
 
 # The Check unit testing framework is optional. Disable if not found.
 PKG_CHECK_MODULES([check], [check >= 0.9.4],
-       [have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS";
-       LIBS="$LIBS $check_LIBS"], [have_check="no"])
+       [have_check="yes"], [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.
+# The OLS driver uses serial port file descriptors directly, and therefore
+# will not currently work on Windows.
 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"
+*mingw*)
+       HW_OPENBENCH_LOGIC_SNIFFER="no"
        ;;
 esac
 
+# The BeagleLogic driver needs sys/mman.h and sys/ioctl.h. Don't try to
+# build it if these headers aren't available.
+AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"])
+
 AC_SUBST(SR_PKGLIBS)
 
+CFLAGS="$CFLAGS -Iinclude/libsigrok -I${srcdir}/include/libsigrok $LIB_CFLAGS"
+CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrok -I${srcdir}/bindings/cxx/include $LIB_CFLAGS"
+
+# Find Java compiler and JNI includes for Java bindings.
+
+AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])
+
+if test "x$HAVE_JAVAC" = "xyes"; then
+       AX_PROG_JAVAC
+       if test "x$JNI_INCLUDE_DIRS" = "xauto"; then
+               if test "x$cross_compiling" = "xyes"; then
+                       JNI_INCLUDE_DIRS=
+               else
+                       AX_JNI_INCLUDE_DIR
+               fi
+       fi
+       for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS; do
+               CXXFLAGS="$CXXFLAGS -I$JNI_INCLUDE_DIR"
+       done
+       AC_LANG_PUSH([C++])
+       AC_CHECK_HEADERS([jni.h], [], [BINDINGS_JAVA="no"; java_msg="Java JNI headers required"])
+       AC_LANG_POP([C++])
+else
+       BINDINGS_JAVA="no"; java_msg="Java compiler required"
+fi
+
+# Python and Java bindings depend on C++ bindings.
+if test "x$BINDINGS_CXX" != "xyes"; then
+       BINDINGS_PYTHON="no"; python_msg="C++ bindings required"
+       BINDINGS_JAVA="no"; java_msg="C++ bindings required"
+fi
+
 # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers.
 
 AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes)
@@ -307,9 +453,9 @@ if test "x$HW_AGILENT_DMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM support])
 fi
 
-AM_CONDITIONAL(HW_ALSA, test x$HW_ALSA = xyes)
-if test "x$HW_ALSA" = "xyes"; then
-       AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support])
+AM_CONDITIONAL(HW_APPA_55II, test x$HW_APPA_55II = xyes)
+if test "x$HW_APPA_55II" = "xyes"; then
+       AC_DEFINE(HAVE_HW_APPA_55II, 1, [APPA 55II support])
 fi
 
 AM_CONDITIONAL(HW_ASIX_SIGMA, test x$HW_ASIX_SIGMA = xyes)
@@ -317,6 +463,21 @@ if test "x$HW_ASIX_SIGMA" = "xyes"; then
        AC_DEFINE(HAVE_HW_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
 fi
 
+AM_CONDITIONAL(HW_ATTEN_PPS3XXX, test x$HW_ATTEN_PPS3XXX = xyes)
+if test "x$HW_ATTEN_PPS3XXX" = "xyes"; then
+       AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support])
+fi
+
+AM_CONDITIONAL(HW_BEAGLELOGIC, test x$HW_BEAGLELOGIC = xyes)
+if test "x$HW_BEAGLELOGIC" = "xyes"; then
+       AC_DEFINE(HAVE_HW_BEAGLELOGIC, 1, [BeagleLogic support])
+fi
+
+AM_CONDITIONAL(HW_BRYMEN_BM86X, test x$HW_BRYMEN_BM86X = xyes)
+if test "x$HW_BRYMEN_BM86X" = "xyes"; then
+       AC_DEFINE(HAVE_HW_BRYMEN_BM86X, 1, [Brymen BM86X support])
+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])
@@ -327,9 +488,14 @@ if test "x$HW_CEM_DT_885X" = "xyes"; then
        AC_DEFINE(HAVE_HW_CEM_DT_885X, 1, [CEM DT-885x support])
 fi
 
-AM_CONDITIONAL(HW_CHRONOVU_LA8, test x$HW_CHRONOVU_LA8 = xyes)
-if test "x$HW_CHRONOVU_LA8" = "xyes"; then
-       AC_DEFINE(HAVE_HW_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
+AM_CONDITIONAL(HW_CENTER_3XX, test x$HW_CENTER_3XX = xyes)
+if test "x$HW_CENTER_3XX" = "xyes"; then
+       AC_DEFINE(HAVE_HW_CENTER_3XX, 1, [Center 3xx support])
+fi
+
+AM_CONDITIONAL(HW_CHRONOVU_LA, test x$HW_CHRONOVU_LA = xyes)
+if test "x$HW_CHRONOVU_LA" = "xyes"; then
+       AC_DEFINE(HAVE_HW_CHRONOVU_LA, 1, [ChronoVu LA support])
 fi
 
 AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes)
@@ -337,6 +503,11 @@ if test "x$HW_COLEAD_SLM" = "xyes"; then
        AC_DEFINE(HAVE_HW_COLEAD_SLM, 1, [Colead SLM support])
 fi
 
+AM_CONDITIONAL(HW_CONRAD_DIGI_35_CPU, test x$HW_CONRAD_DIGI_35_CPU = xyes)
+if test "x$HW_CONRAD_DIGI_35_CPU" = "xyes"; then
+       AC_DEFINE(HAVE_HW_CONRAD_DIGI_35_CPU, 1, [Conrad DIGI 35 CPU support])
+fi
+
 AM_CONDITIONAL(HW_DEMO, test x$HW_DEMO = xyes)
 if test "x$HW_DEMO" = "xyes"; then
        AC_DEFINE(HAVE_HW_DEMO, 1, [Demo driver support])
@@ -352,19 +523,29 @@ if test "x$HW_FX2LAFW" = "xyes"; then
        AC_DEFINE(HAVE_HW_FX2LAFW, 1, [fx2lafw support])
 fi
 
+AM_CONDITIONAL(HW_GMC_MH_1X_2X, test x$HW_GMC_MH_1X_2X = xyes)
+if test "x$HW_GMC_MH_1X_2X" = "xyes"; then
+       AC_DEFINE(HAVE_HW_GMC_MH_1X_2X, 1, [gmc-mh-1x-2x support])
+fi
+
 AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes)
 if test "x$HW_HANTEK_DSO" = "xyes"; then
        AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support])
 fi
 
+AM_CONDITIONAL(HW_HAMEG_HMO, test x$HW_HAMEG_HMO = xyes)
+if test "x$HW_HAMEG_HMO" = "xyes"; then
+       AC_DEFINE(HAVE_HW_HAMEG_HMO, 1, [Hameg HMO support])
+fi
+
 AM_CONDITIONAL(HW_IKALOGIC_SCANALOGIC2, test x$HW_IKALOGIC_SCANALOGIC2 = xyes)
 if test "x$HW_IKALOGIC_SCANALOGIC2" = "xyes"; then
-       AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [IKALOGIC Scanalogic2 support])
+       AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [IKALOGIC Scanalogic-2 support])
 fi
 
 AM_CONDITIONAL(HW_IKALOGIC_SCANAPLUS, test x$HW_IKALOGIC_SCANAPLUS = xyes)
 if test "x$HW_IKALOGIC_SCANAPLUS" = "xyes"; then
-       AC_DEFINE(HAVE_HW_IKALOGIC_SCANAPLUS, 1, [Ikalogic ScanaPLUS support])
+       AC_DEFINE(HAVE_HW_IKALOGIC_SCANAPLUS, 1, [IKALOGIC ScanaPLUS support])
 fi
 
 AM_CONDITIONAL(HW_KECHENG_KC_330B, test x$HW_KECHENG_KC_330B = xyes)
@@ -377,9 +558,9 @@ if test "x$HW_LASCAR_EL_USB" = "xyes"; then
        AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support])
 fi
 
-AM_CONDITIONAL(HW_LINK_MSO19, test x$HW_LINK_MSO19 = xyes)
-if test "x$HW_LINK_MSO19" = "xyes"; then
-       AC_DEFINE(HAVE_HW_LINK_MSO19, 1, [Link Instruments MSO-19 support])
+AM_CONDITIONAL(HW_MANSON_HCS_3XXX, test x$HW_MANSON_HCS_3XXX = xyes)
+if test "x$HW_MANSON_HCS_3XXX" = "xyes"; then
+       AC_DEFINE(HAVE_HW_MANSON_HCS_3XXX, 1, [Manson HCS-3xxx support])
 fi
 
 AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes)
@@ -387,14 +568,34 @@ if test "x$HW_MIC_985XX" = "xyes"; then
        AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support])
 fi
 
-AM_CONDITIONAL(HW_OLS, test x$HW_OLS = xyes)
-if test "x$HW_OLS" = "xyes"; then
-       AC_DEFINE(HAVE_HW_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
+AM_CONDITIONAL(HW_MOTECH_LPS_30X, test x$HW_MOTECH_LPS_30X = xyes)
+if test "x$HW_MOTECH_LPS_30X" = "xyes"; then
+       AC_DEFINE(HAVE_HW_MOTECH_LPS_30X, 1, [motech-lps-30x support])
+fi
+
+AM_CONDITIONAL(HW_NORMA_DMM, test x$HW_NORMA_DMM = xyes)
+if test "x$HW_NORMA_DMM" = "xyes"; then
+       AC_DEFINE(HAVE_HW_NORMA_DMM, 1, [Norma DMM support])
+fi
+
+AM_CONDITIONAL(HW_OPENBENCH_LOGIC_SNIFFER, test x$HW_OPENBENCH_LOGIC_SNIFFER = xyes)
+if test "x$HW_OPENBENCH_LOGIC_SNIFFER" = "xyes"; then
+       AC_DEFINE(HAVE_HW_OPENBENCH_LOGIC_SNIFFER, 1, [OpenBench Logic Sniffer (OLS) support])
+fi
+
+AM_CONDITIONAL(HW_PIPISTRELLO_OLS, test x$HW_PIPISTRELLO_OLS = xyes)
+if test "x$HW_PIPISTRELLO_OLS" = "xyes"; then
+       AC_DEFINE(HAVE_HW_PIPISTRELLO_OLS, 1, [Pipistrello OLS support])
 fi
 
-AM_CONDITIONAL(HW_RIGOL_DS1XX2, test x$HW_RIGOL_DS1XX2 = xyes)
-if test "x$HW_RIGOL_DS1XX2" = "xyes"; then
-       AC_DEFINE(HAVE_HW_RIGOL_DS1XX2, 1, [Rigol DS1xx2 support])
+AM_CONDITIONAL(HW_RIGOL_DS, test x$HW_RIGOL_DS = xyes)
+if test "x$HW_RIGOL_DS" = "xyes"; then
+       AC_DEFINE(HAVE_HW_RIGOL_DS, 1, [Rigol DS support])
+fi
+
+AM_CONDITIONAL(HW_SALEAE_LOGIC16, test x$HW_SALEAE_LOGIC16 = xyes)
+if test "x$HW_SALEAE_LOGIC16" = "xyes"; then
+       AC_DEFINE(HAVE_HW_SALEAE_LOGIC16, 1, [Saleae Logic16 support])
 fi
 
 AM_CONDITIONAL(HW_SERIAL_DMM, test x$HW_SERIAL_DMM = xyes)
@@ -402,6 +603,21 @@ if test "x$HW_SERIAL_DMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_SERIAL_DMM, 1, [Serial DMM support])
 fi
 
+AM_CONDITIONAL(HW_SYSCLK_LWLA, test x$HW_SYSCLK_LWLA = xyes)
+if test "x$HW_SYSCLK_LWLA" = "xyes"; then
+       AC_DEFINE(HAVE_HW_SYSCLK_LWLA, 1, [Sysclk LWLA support])
+fi
+
+AM_CONDITIONAL(HW_TELEINFO, test x$HW_TELEINFO = xyes)
+if test "x$HW_TELEINFO" = "xyes"; then
+       AC_DEFINE(HAVE_HW_TELEINFO, 1, [Teleinfo support])
+fi
+
+AM_CONDITIONAL(HW_TESTO, test x$HW_TESTO = xyes)
+if test "x$HW_TESTO" = "xyes"; then
+       AC_DEFINE(HAVE_HW_TESTO, 1, [Testo support])
+fi
+
 AM_CONDITIONAL(HW_TONDAJ_SL_814, test x$HW_TONDAJ_SL_814 = xyes)
 if test "x$HW_TONDAJ_SL_814" = "xyes"; then
        AC_DEFINE(HAVE_HW_TONDAJ_SL_814, 1, [Tondaj SL-814 support])
@@ -412,6 +628,11 @@ if test "x$HW_UNI_T_DMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_UNI_T_DMM, 1, [UNI-T DMM support])
 fi
 
+AM_CONDITIONAL(HW_UNI_T_UT32X, test x$HW_UNI_T_UT32X = xyes)
+if test "x$HW_UNI_T_UT32X" = "xyes"; then
+       AC_DEFINE(HAVE_HW_UNI_T_UT32X, 1, [UNI-T UT32x support])
+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])
@@ -422,24 +643,18 @@ if test "x$HW_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
        AC_DEFINE(HAVE_HW_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
 fi
 
+AM_CONDITIONAL(BINDINGS_CXX, test x$BINDINGS_CXX = xyes)
+
+AM_CONDITIONAL(BINDINGS_PYTHON, test x$BINDINGS_PYTHON = xyes)
+
+AM_CONDITIONAL(BINDINGS_JAVA, test x$BINDINGS_JAVA = xyes)
+
 # Checks for header files.
-# These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
-AC_CHECK_HEADERS([fcntl.h sys/time.h termios.h])
+# These are already implicitly checked: inttypes.h stdint.h stdlib.h string.h
+# unistd.h memory.h strings.h dlfcn.h sys/types.h sys/stat.h.
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_CHECK_FUNCS([gettimeofday memset strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull])
+AC_C_BIGENDIAN
 
 AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware")
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
@@ -455,40 +670,8 @@ AC_SUBST(SR_PACKAGE_VERSION_MINOR)
 AC_SUBST(SR_PACKAGE_VERSION_MICRO)
 AC_SUBST(SR_PACKAGE_VERSION)
 
-AC_CONFIG_FILES([Makefile version.h hardware/Makefile
-                hardware/agilent-dmm/Makefile
-                hardware/alsa/Makefile
-                hardware/asix-sigma/Makefile
-                hardware/brymen-dmm/Makefile
-                hardware/cem-dt-885x/Makefile
-                hardware/chronovu-la8/Makefile
-                hardware/colead-slm/Makefile
-                hardware/common/Makefile
-                hardware/ikalogic-scanalogic2/Makefile
-                hardware/ikalogic-scanaplus/Makefile
-                hardware/kecheng-kc-330b/Makefile
-                hardware/lascar-el-usb/Makefile
-                hardware/mic-985xx/Makefile
-                hardware/rigol-ds1xx2/Makefile
-                hardware/tondaj-sl-814/Makefile
-                hardware/victor-dmm/Makefile
-                hardware/common/dmm/Makefile
-                hardware/demo/Makefile
-                hardware/fluke-dmm/Makefile
-                hardware/fx2lafw/Makefile
-                hardware/hantek-dso/Makefile
-                hardware/link-mso19/Makefile
-                hardware/openbench-logic-sniffer/Makefile
-                hardware/serial-dmm/Makefile
-                hardware/uni-t-dmm/Makefile
-                hardware/zeroplus-logic-cube/Makefile
-                input/Makefile
-                output/Makefile
-                output/text/Makefile
-                libsigrok.pc
-                contrib/Makefile
-                tests/Makefile
-               ])
+AC_CONFIG_FILES([Makefile include/libsigrok/version.h libsigrok.pc
+       bindings/cxx/libsigrokxx.pc])
 
 AC_OUTPUT
 
@@ -505,40 +688,49 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-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
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.2.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.0" "glibmm-2.4 >= 2.32.0" "pygobject-3.0 >= 3.0.0" "check >= 0.9.4"; do
+       optional="OPTIONAL"
+       if test "x$lib" = "xglib-2.0 >= 2.32.0"; then optional="REQUIRED"; fi
+       if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi
        if `$PKG_CONFIG --exists $lib`; then
                ver=`$PKG_CONFIG --modversion $lib`
                answer="yes ($ver)"
        else
                answer="no"
        fi
-       echo "  - $lib: $answer"
+       echo "  - ($optional) $lib: $answer"
 done
 
-echo -e "\nEnabled hardware drivers:\n"
-echo "  - agilent-dmm..................... $HW_AGILENT_DMM"
-echo "  - alsa............................ $HW_ALSA"
-echo "  - asix-sigma...................... $HW_ASIX_SIGMA"
-echo "  - brymen-dmm...................... $HW_BRYMEN_DMM"
-echo "  - cem-dt-885x..................... $HW_CEM_DT_885X"
-echo "  - chronovu-la8.................... $HW_CHRONOVU_LA8"
-echo "  - colead-slm...................... $HW_COLEAD_SLM"
-echo "  - demo............................ $HW_DEMO"
-echo "  - fluke-dmm....................... $HW_FLUKE_DMM"
-echo "  - fx2lafw......................... $HW_FX2LAFW"
-echo "  - hantek-dso...................... $HW_HANTEK_DSO"
-echo "  - ikalogic-scanalogic2............ $HW_IKALOGIC_SCANALOGIC2"
-echo "  - ikalogic-scanaplus.............. $HW_IKALOGIC_SCANAPLUS"
-echo "  - kecheng-kc-330b................. $HW_KECHENG_KC_330B"
-echo "  - lascar-el-usb................... $HW_LASCAR_EL_USB"
-echo "  - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19"
-echo "  - mic-985xx....................... $HW_MIC_985XX"
-echo "  - openbench-logic-sniffer......... $HW_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............. $HW_ZEROPLUS_LOGIC_CUBE"
-echo
+eval echo -e "@Enabled hardware drivers:@@${driver_summary}" | tr @ \\n
+
+# Prepare final bindings report messages
+final_cxx=""
+final_python=""
+final_java=""
+if test "$enable_bindings" = "no"; then
+       final_cxx=" (disabled)"
+       final_python=" (disabled)"
+       final_java=" (disabled)"
+else
+       if test "$enable_cxx" = "no"; then
+               final_cxx=" (disabled)"
+       elif test "$BINDINGS_CXX" = "no"; then
+               final_cxx=" ($cxx_msg)"
+       fi
+       if test "$enable_python" = "no"; then
+               final_python=" (disabled)"
+       elif test "$BINDINGS_PYTHON" = "no"; then
+               final_python=" ($python_msg)"
+       fi
+       if test "$enable_java" = "no"; then
+               final_java=" (disabled)"
+       elif test "$BINDINGS_JAVA" = "no"; then
+               final_java=" ($java_msg)"
+       fi
+fi
 
+echo -e "Enabled language bindings:\n"
+echo " - C++............................. $BINDINGS_CXX$final_cxx"
+echo " - Python.......................... $BINDINGS_PYTHON$final_python"
+echo " - Java............................ $BINDINGS_JAVA$final_java"
+echo