X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=configure.ac;h=f6f390112a566362f347f645f727903791fc41b1;hp=6b4548837515b6ee53c98ceac5f2fc2af5bf4e96;hb=c5f179a9753fde952fcfd5585378f5605ab90741;hpb=41b7bd01c1f58f0214b16949a89ed0d283aa4220 diff --git a/configure.ac b/configure.ac index 6b454883..f6f39011 100644 --- a/configure.ac +++ b/configure.ac @@ -23,18 +23,18 @@ 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], [3]) +m4_define([sr_package_version_minor], [4]) m4_define([sr_package_version_micro], [0]) -m4_define([sr_package_version], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro]) -AC_INIT([libsigrok], [sr_package_version], [sigrok-devel@lists.sourceforge.net], +AC_INIT([libsigrok], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro], + [sigrok-devel@lists.sourceforge.net], [libsigrok], [http://www.sigrok.org]) -AC_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h include/libsigrok/version.h]) 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 subdir-objects check-news color-tests]) +AM_INIT_AUTOMAKE([1.11 -Wall -Werror no-define nostdinc subdir-objects check-news color-tests]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -45,11 +45,13 @@ 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. COMMON_FLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden" -CFLAGS="$COMMON_FLAGS -Wmissing-prototypes" +CFLAGS="$COMMON_FLAGS -std=c11 -D_POSIX_C_SOURCE=200112L -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 @@ -63,6 +65,31 @@ LT_INIT # We require at least 0.22, as "Requires.private" behaviour changed there. PKG_PROG_PKG_CONFIG([0.22]) +CONFIG_STATUS_DEPENDENCIES= +SR_PACKAGE_VERSION="AC_PACKAGE_VERSION" + +# Check if we can get revision information from git. +sr_head=`git -C "$srcdir" rev-parse --verify --short HEAD 2>&AS_MESSAGE_LOG_FD` + +AS_IF([test "$?" -eq 0 && test -n "$sr_head"], [ + CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/.git/HEAD' + sr_head_name=`git -C "$srcdir" rev-parse --symbolic-full-name HEAD 2>&AS_MESSAGE_LOG_FD` + AS_IF([test "$?" -eq 0 && test -f "$srcdir/.git/$sr_head_name"], + [CONFIG_STATUS_DEPENDENCIES="$CONFIG_STATUS_DEPENDENCIES \$(top_srcdir)/.git/$sr_head_name"]) + + # Append the revision hash unless we are exactly on a tagged release. + git -C "$srcdir" describe --match 'AC_PACKAGE_NAME-AC_PACKAGE_VERSION' \ + --exact-match >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD \ + || SR_PACKAGE_VERSION="$SR_PACKAGE_VERSION-git-$sr_head" +]) +AC_SUBST([CONFIG_STATUS_DEPENDENCIES]) +AC_SUBST([SR_PACKAGE_VERSION]) + +AC_DEFINE([SR_PACKAGE_VERSION_MAJOR], [sr_package_version_major], [.]) +AC_DEFINE([SR_PACKAGE_VERSION_MINOR], [sr_package_version_minor], [.]) +AC_DEFINE([SR_PACKAGE_VERSION_MICRO], [sr_package_version_micro], [.]) +AC_DEFINE_UNQUOTED([SR_PACKAGE_VERSION_STRING], ["$SR_PACKAGE_VERSION"], [.]) + # Library version for libsigrok (NOT the same as the package version). # Carefully read the libtool docs before updating these numbers! # The algorithm for determining which number to change (and how) is nontrivial! @@ -70,196 +97,169 @@ PKG_PROG_PKG_CONFIG([0.22]) 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" -SR_LIB_LDFLAGS="-version-info $SR_LIB_VERSION" -AC_SUBST(SR_LIB_VERSION_CURRENT) -AC_SUBST(SR_LIB_VERSION_REVISION) -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]]), + +AC_SUBST([SR_LIB_VERSION], ["$SR_LIB_VERSION_CURRENT:$SR_LIB_VERSION_REVISION:$SR_LIB_VERSION_AGE"]) +AC_SUBST([SR_LIB_LDFLAGS], ["-version-info $SR_LIB_VERSION"]) + +AC_DEFINE_UNQUOTED([SR_LIB_VERSION_CURRENT], [$SR_LIB_VERSION_CURRENT], [.]) +AC_DEFINE_UNQUOTED([SR_LIB_VERSION_REVISION], [$SR_LIB_VERSION_REVISION], [.]) +AC_DEFINE_UNQUOTED([SR_LIB_VERSION_AGE], [$SR_LIB_VERSION_AGE], [.]) +AC_DEFINE_UNQUOTED([SR_LIB_VERSION_STRING], ["$SR_LIB_VERSION"], [.]) + +AC_ARG_ENABLE([all-drivers], + [AS_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(appa-55ii, AC_HELP_STRING([--enable-appa-55ii], - [enable APPA 55II support [default=yes]]), - [HW_APPA_55II="$enableval"], - [HW_APPA_55II=$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(atten-pps3xxx, AC_HELP_STRING([--enable-atten-pps3xxx], - [enable Atten PPS3xxx support [default=yes]]), - [HW_ATTEN_PPS3XXX="$enableval"], - [HW_ATTEN_PPS3XXX=$HW_ENABLED_DEFAULT]) - -AC_ARG_ENABLE(brymen-bm86x, AC_HELP_STRING([--enable-brymen-bm86x], - [enable Brymen BM86X support [default=yes]]), - [HW_BRYMEN_BM86X="$enableval"], - [HW_BRYMEN_BM86X=$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=$HW_ENABLED_DEFAULT]) - -AC_ARG_ENABLE(center-3xx, AC_HELP_STRING([--enable-center-3xx], - [enable Center 3xx support [default=yes]]), - [HW_CENTER_3XX="$enableval"], - [HW_CENTER_3XX=$HW_ENABLED_DEFAULT]) - -AC_ARG_ENABLE(chronovu-la, AC_HELP_STRING([--enable-chronovu-la], - [enable ChronoVu LA support [default=yes]]), - [HW_CHRONOVU_LA="$enableval"], - [HW_CHRONOVU_LA=$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(conrad-digi-35-cpu, AC_HELP_STRING([--enable-conrad-digi-35-cpu], - [enable Conrad DIGI 35 CPU support [default=yes]]), - [HW_CONRAD_DIGI_35_CPU="$enableval"], - [HW_CONRAD_DIGI_35_CPU=$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(gmc-mh-1x-2x, AC_HELP_STRING([--enable-gmc-mh-1x-2x], - [enable gmc-mh-1x-2x support [default=yes]]), - [HW_GMC_MH_1X_2X="$enableval"], - [HW_GMC_MH_1X_2X=$HW_ENABLED_DEFAULT]) - -AC_ARG_ENABLE(hameg-hmo, AC_HELP_STRING([--enable-hameg-hmo], - [enable Hameg HMO support [default=yes]]), - [HW_HAMEG_HMO="$enableval"], - [HW_HAMEG_HMO=$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 Scanalogic-2 support [default=yes]]), - [HW_IKALOGIC_SCANALOGIC2="$enableval"], - [HW_IKALOGIC_SCANALOGIC2=$HW_ENABLED_DEFAULT]) - -AC_ARG_ENABLE(ikalogic-scanaplus, AC_HELP_STRING([--enable-ikalogic-scanaplus], - [enable IKALOGIC ScanaPLUS support [default=yes]]), - [HW_IKALOGIC_SCANAPLUS="$enableval"], - [HW_IKALOGIC_SCANAPLUS=$HW_ENABLED_DEFAULT]) - -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=$HW_ENABLED_DEFAULT]) - -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(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(motech-lps-30x, AC_HELP_STRING([--enable-motech-lps-30x], - [enable motech-lps-30x support [default=yes]]), - [HW_MOTECH_LPS_30X="$enableval"], - [HW_MOTECH_LPS_30X=$HW_ENABLED_DEFAULT]) - -AC_ARG_ENABLE(norma-dmm, AC_HELP_STRING([--enable-norma-dmm], - [enable Norma DMM support [default=yes]]), - [HW_NORMA_DMM="$enableval"], - [HW_NORMA_DMM=$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-ds, AC_HELP_STRING([--enable-rigol-ds], - [enable Rigol DS support [default=yes]]), - [HW_RIGOL_DS="$enableval"], - [HW_RIGOL_DS=$HW_ENABLED_DEFAULT]) - -AC_ARG_ENABLE(saleae-logic16, AC_HELP_STRING([--enable-saleae-logic16], - [enable Saleae Logic16 support [default=yes]]), - [HW_SALEAE_LOGIC16="$enableval"], - [HW_SALEAE_LOGIC16=$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(sysclk-lwla, AC_HELP_STRING([--enable-sysclk-lwla], - [enable Sysclk LWLA support [default=yes]]), - [HW_SYSCLK_LWLA="$enableval"], - [HW_SYSCLK_LWLA=$HW_ENABLED_DEFAULT]) - -AC_ARG_ENABLE(teleinfo, AC_HELP_STRING([--enable-teleinfo], - [enable Teleinfo support [default=yes]]), - [HW_TELEINFO="$enableval"], - [HW_TELEINFO=$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(uni-t-ut32x, AC_HELP_STRING([--enable-uni-t-ut32x], - [enable UNI-T UT32x support [default=yes]]), - [HW_UNI_T_UT32X="$enableval"], - [HW_UNI_T_UT32X=$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]) +## _SR_DRIVER(Device name, driver-name, enable, var-name) +m4_define([_SR_DRIVER], [ + AC_ARG_ENABLE([$4], + [AS_HELP_STRING([--enable-$2], [enable $1 support])], + [$4=$enableval], [$4=$3]) + m4_append([SR_DRIVER_SUMMARY], + [ - m4_translit(m4_format([%-32s], [$2]), [ ], [.]) [$]$4], + m4_newline) + AC_CONFIG_COMMANDS_PRE([dnl + AM_CONDITIONAL([$4], [test "x[$]$4" = xyes]) + AM_COND_IF([$4], [AC_DEFINE([HAVE_$4], [1], [Whether to support $1 device.])]) + ]) +]) +## SR_DRIVER(Device name, driver-name, [no]) +m4_define([SR_DRIVER], + [_SR_DRIVER([$1], [$2], + m4_default_quoted([$3], [$HW_ENABLED_DEFAULT]), + m4_expand([AS_TR_CPP([HW_$2])]))]) + +SR_DRIVER([Agilent DMM], [agilent-dmm]) +SR_DRIVER([Appa 55II], [appa-55ii]) +SR_DRIVER([ASIX SIGMA/SIGMA2], [asix-sigma]) +SR_DRIVER([Atten PPS3xxx], [atten-pps3xxx]) +SR_DRIVER([BayLibre ACME], [baylibre-acme]) +SR_DRIVER([BeagleLogic], [beaglelogic]) +SR_DRIVER([Brymen BM86x], [brymen-bm86x]) +SR_DRIVER([Brymen DMM], [brymen-dmm]) +SR_DRIVER([CEM DT-885x], [cem-dt-885x]) +SR_DRIVER([Center 3xx], [center-3xx]) +SR_DRIVER([ChronoVu LA], [chronovu-la]) +SR_DRIVER([Colead SLM], [colead-slm]) +SR_DRIVER([Conrad DIGI 35 CPU], [conrad-digi-35-cpu]) +SR_DRIVER([DER EE DE-5000], [deree-de5000]) +SR_DRIVER([demo], [demo]) +SR_DRIVER([Fluke DMM], [fluke-dmm]) +SR_DRIVER([fx2lafw], [fx2lafw]) +SR_DRIVER([GMC MH 1x/2x], [gmc-mh-1x-2x]) +SR_DRIVER([Hameg HMO], [hameg-hmo]) +SR_DRIVER([Hantek DSO], [hantek-dso]) +SR_DRIVER([Ikalogic Scanalogic-2], [ikalogic-scanalogic2]) +SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus]) +SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b]) +SR_DRIVER([Lascar EL-USB], [lascar-el-usb]) +SR_DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx]) +SR_DRIVER([maynuo-m97], [maynuo-m97]) +SR_DRIVER([MIC 985xx], [mic-985xx]) +SR_DRIVER([Motech LPS 30x], [motech-lps-30x]) +SR_DRIVER([Norma DMM], [norma-dmm]) +SR_DRIVER([OpenBench Logic Sniffer], [openbench-logic-sniffer]) +SR_DRIVER([Pipistrello-OLS], [pipistrello-ols]) +SR_DRIVER([Rigol DS], [rigol-ds]) +SR_DRIVER([Saleae Logic16], [saleae-logic16]) +SR_DRIVER([SCPI PPS], [scpi-pps]) +SR_DRIVER([serial DMM], [serial-dmm]) +SR_DRIVER([Sysclk LWLA], [sysclk-lwla]) +SR_DRIVER([Teleinfo], [teleinfo]) +SR_DRIVER([Testo], [testo]) +SR_DRIVER([Tondaj SL-814], [tondaj-sl-814]) +SR_DRIVER([UNI-T DMM], [uni-t-dmm]) +SR_DRIVER([UNI-T UT32x], [uni-t-ut32x]) +SR_DRIVER([Victor DMM], [victor-dmm]) +SR_DRIVER([Yokogawa DL/DLM], [yokogawa-dlm]) +SR_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. +AM_PATH_PYTHON([2.7], [HAVE_PYTHON="yes"], + [HAVE_PYTHON="no"; BINDINGS_CXX="no"; cxx_msg="Python required"]) + +# 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. @@ -280,15 +280,17 @@ 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 ], - [CLIENT *rpc_test(void)], - [{ return clnt_create("", 0, 0, ""); }])], - [AC_MSG_RESULT([yes]); have_rpc=1], - [AC_MSG_RESULT([no]); have_rpc=0]) + [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") +AC_DEFINE_UNQUOTED(HOST, ["$host"], [.]) + # 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(). @@ -299,23 +301,34 @@ AM_PATH_GLIB_2_0([2.32.0], PKG_CHECK_MODULES([libzip], [libzip >= 0.10], [LIB_CFLAGS="$LIB_CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libzip"]) +libzip_ver=`$PKG_CONFIG --modversion libzip` +AC_DEFINE_UNQUOTED(HAVE_LIBZIP_VER, ["$libzip_ver"], [.]) # libserialport is only needed for some hardware drivers. Disable the # respective drivers if it is not found. -PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], - [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS"; - LIBS="$LIBS $libserialport_LIBS"; - SR_PKGLIBS="$SR_PKGLIBS libserialport"], - [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="no"; +if test "x$enable_libserialport" != "xno"; then + PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.1], + [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 +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_MIC_985XX="no"; HW_MOTECH_LPS_30X="no"; HW_NORMA_DMM="no"; - HW_OLS="no"; HW_SERIAL_DMM="no"; HW_TELEINFO="no"; - HW_TONDAJ_SL_814="no"]) - -# Define HAVE_LIBSERIALPORT in config.h if we found libserialport. -if test "x$have_libserialport" != "xno"; then + HW_DEREE_DE5000="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 + # Define HAVE_LIBSERIALPORT in config.h if we found libserialport. AC_DEFINE_UNQUOTED(HAVE_LIBSERIALPORT, [1], [Specifies whether we have libserialport.]) fi @@ -323,277 +336,202 @@ 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], +# The VISA SCPI backend is only compiled in if librevisa was found. +PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130412], [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 + # Define HAVE_LIBREVISA in config.h if we found librevisa. AC_DEFINE_UNQUOTED(HAVE_LIBREVISA, [1], [Specifies whether we have librevisa.]) + librevisa_ver=`$PKG_CONFIG --modversion librevisa` + AC_DEFINE_UNQUOTED(HAVE_LIBREVISA_VER, ["$librevisa_ver"], [.]) +fi + +# The GPIB SCPI backend is only compiled in if libgpib is found. +PKG_CHECK_MODULES([libgpib], [libgpib], + [have_libgpib="yes"; LIB_CFLAGS="$LIB_CFLAGS $libgpib_CFLAGS"; + LIBS="$LIBS $libgpib_LIBS"; + SR_PKGLIBS="$SR_PKGLIBS libgpib"], + [have_libgpib="no"]) +AM_CONDITIONAL(NEED_GPIB, test "x$have_libgpib" != xno) +if test "x$have_libgpib" != "xno"; then + # Define HAVE_LIBGPIB in config.h if we found libgpib. + AC_DEFINE_UNQUOTED(HAVE_LIBGPIB, [1], + [Specifies whether we have libgpib.]) + libgpib_ver=`$PKG_CONFIG --modversion libgpib` + AC_DEFINE_UNQUOTED(HAVE_LIBGPIB_VER, ["$libgpib_ver"], [.]) 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. - 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.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"; 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_UNI_T_DMM="no"; - HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no"; - HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"]) - +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 +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 # 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 + AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1], + [Specifies whether we have libusb-1.0.]) +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], - [LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS"; - LIBS="$LIBS $libftdi_LIBS"; - SR_PKGLIBS="$SR_PKGLIBS libftdi"], - [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="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"; + libftdi_ver=`$PKG_CONFIG --modversion libftdi`], + [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.0], + [LIB_CFLAGS="$LIB_CFLAGS $libftdi1_CFLAGS"; + LIBS="$LIBS $libftdi1_LIBS"; + SR_PKGLIBS="$SR_PKGLIBS libftdi1"; + libftdi_ver=`$PKG_CONFIG --modversion 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"; +else + # Define HAVE_LIBFTDI in config.h if we found libftdi. + AC_DEFINE_UNQUOTED(HAVE_LIBFTDI, [1], + [Specifies whether we have libftdi.]) + AC_DEFINE_UNQUOTED(HAVE_LIBFTDI_VER, ["$libftdi_ver"], [.]) +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"]) + +# C++ bindings want stoi and stod. +if test "x$BINDINGS_CXX" = "xyes"; then + AC_LANG_PUSH([C++]) + AC_MSG_CHECKING([for stoi and stod]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [{ return std::stoi("1") + std::stod("1.0"); }])], + [AC_MSG_RESULT([yes]); + AC_DEFINE_UNQUOTED(HAVE_STOI_STOD, [1], + [Specifies whether we have the stoi and stod functions.])], + [AC_MSG_RESULT([no])]) + AC_LANG_POP([C++]) +fi + +# 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"; LIB_CFLAGS="$LIB_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 OLS driver uses serial port file descriptors directly, and therefore -# will not currently work on Windows. +# 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"]) + +# The BayLibre ACME driver needs sys/timerfd.h. Don't try to build it if +# this header isn't available. +AC_CHECK_HEADERS([sys/timerfd.h], [], [HW_BAYLIBRE_ACME="no"]) + +# The ACME driver can only be built for Linux. case "$host" in -*mingw*) - HW_OLS="no" - ;; + *linux*) ;; + *) HW_BAYLIBRE_ACME="no" ;; esac AC_SUBST(SR_PKGLIBS) CFLAGS="$CFLAGS $LIB_CFLAGS" - -# Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers. - -AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes) -if test "x$HW_AGILENT_DMM" = "xyes"; then - AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM support]) -fi - -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) -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_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]) -fi - -AM_CONDITIONAL(HW_CEM_DT_885X, test x$HW_CEM_DT_885X = xyes) -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_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) -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]) -fi - -AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes) -if test "x$HW_FLUKE_DMM" = "xyes"; then - AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support]) -fi - -AM_CONDITIONAL(HW_FX2LAFW, test x$HW_FX2LAFW = xyes) -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 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]) -fi - -AM_CONDITIONAL(HW_KECHENG_KC_330B, test x$HW_KECHENG_KC_330B = xyes) -if test "x$HW_KECHENG_KC_330B" = "xyes"; then - AC_DEFINE(HAVE_HW_KECHENG_KC_330B, 1, [Kecheng KC-330B support]) -fi - -AM_CONDITIONAL(HW_LASCAR_EL_USB, test x$HW_LASCAR_EL_USB = xyes) -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_MIC_985XX, test x$HW_MIC_985XX = xyes) -if test "x$HW_MIC_985XX" = "xyes"; then - AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support]) -fi - -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_OLS, test x$HW_OLS = xyes) -if test "x$HW_OLS" = "xyes"; then - AC_DEFINE(HAVE_HW_OLS, 1, [OpenBench Logic Sniffer (OLS) support]) -fi - -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) -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]) +CXXFLAGS="$CXXFLAGS $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" && test "x$BINDINGS_JAVA" = "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 -AM_CONDITIONAL(HW_TELEINFO, test x$HW_TELEINFO = xyes) -if test "x$HW_TELEINFO" = "xyes"; then - AC_DEFINE(HAVE_HW_TELEINFO, 1, [Teleinfo support]) +# 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 -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]) -fi +AM_CONDITIONAL(BINDINGS_CXX, test x$BINDINGS_CXX = xyes) -AM_CONDITIONAL(HW_UNI_T_DMM, test x$HW_UNI_T_DMM = xyes) -if test "x$HW_UNI_T_DMM" = "xyes"; then - AC_DEFINE(HAVE_HW_UNI_T_DMM, 1, [UNI-T DMM support]) -fi +AM_CONDITIONAL(BINDINGS_PYTHON, test x$BINDINGS_PYTHON = xyes) -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]) -fi - -AM_CONDITIONAL(HW_ZEROPLUS_LOGIC_CUBE, test x$HW_ZEROPLUS_LOGIC_CUBE = xyes) -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_JAVA, test x$BINDINGS_JAVA = xyes) # Checks for header files. -# These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.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_BIGENDIAN -AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware") +AC_SUBST([FIRMWARE_DIR], ['$(datadir)/sigrok-firmware']) AC_SUBST(MAKEFLAGS, '--no-print-directory') AC_SUBST(AM_LIBTOOLFLAGS, '--silent') -SR_PACKAGE_VERSION_MAJOR=sr_package_version_major -SR_PACKAGE_VERSION_MINOR=sr_package_version_minor -SR_PACKAGE_VERSION_MICRO=sr_package_version_micro -SR_PACKAGE_VERSION=sr_package_version - -AC_SUBST(SR_PACKAGE_VERSION_MAJOR) -AC_SUBST(SR_PACKAGE_VERSION_MINOR) -AC_SUBST(SR_PACKAGE_VERSION_MICRO) -AC_SUBST(SR_PACKAGE_VERSION) - -AC_CONFIG_FILES([Makefile version.h libsigrok.pc]) +AC_CONFIG_FILES([Makefile libsigrok.pc bindings/cxx/libsigrokcxx.pc]) AC_OUTPUT @@ -610,7 +548,11 @@ 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.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "check >= 0.9.4"; do +for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.1" \ + "librevisa >= 0.0.20130412" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \ + "libftdi1 >= 1.0" "libgpib" "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 @@ -623,41 +565,54 @@ for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "libre echo " - ($optional) $lib: $answer" done -echo -e "\nEnabled hardware drivers:\n" -echo " - agilent-dmm..................... $HW_AGILENT_DMM" -echo " - appa-55ii....................... $HW_APPA_55II" -echo " - asix-sigma...................... $HW_ASIX_SIGMA" -echo " - atten-pps3xxx................... $HW_ATTEN_PPS3XXX" -echo " - brymen-bm86x.................... $HW_BRYMEN_BM86X" -echo " - brymen-dmm...................... $HW_BRYMEN_DMM" -echo " - cem-dt-885x..................... $HW_CEM_DT_885X" -echo " - center-3xx...................... $HW_CENTER_3XX" -echo " - chronovu-la..................... $HW_CHRONOVU_LA" -echo " - colead-slm...................... $HW_COLEAD_SLM" -echo " - conrad-digi-35-cpu.............. $HW_CONRAD_DIGI_35_CPU" -echo " - demo............................ $HW_DEMO" -echo " - fluke-dmm....................... $HW_FLUKE_DMM" -echo " - fx2lafw......................... $HW_FX2LAFW" -echo " - gmc-mh-1x-2x.................... $HW_GMC_MH_1X_2X" -echo " - hameg-hmo....................... $HW_HAMEG_HMO" -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 " - mic-985xx....................... $HW_MIC_985XX" -echo " - motech-lps-30x.................. $HW_MOTECH_LPS_30X" -echo " - norma-dmm....................... $HW_NORMA_DMM" -echo " - openbench-logic-sniffer......... $HW_OLS" -echo " - rigol-ds........................ $HW_RIGOL_DS" -echo " - saleae-logic16.................. $HW_SALEAE_LOGIC16" -echo " - serial-dmm...................... $HW_SERIAL_DMM" -echo " - sysclk-lwla..................... $HW_SYSCLK_LWLA" -echo " - teleinfo........................ $HW_TELEINFO" -echo " - tondaj-sl-814................... $HW_TONDAJ_SL_814" -echo " - uni-t-dmm....................... $HW_UNI_T_DMM" -echo " - uni-t-ut32x..................... $HW_UNI_T_UT32X" -echo " - victor-dmm...................... $HW_VICTOR_DMM" -echo " - zeroplus-logic-cube............. $HW_ZEROPLUS_LOGIC_CUBE" +cat <<_EOF + +Enabled hardware drivers: +SR_DRIVER_SUMMARY + +_EOF + +# 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 "Enabled SCPI backends:" +echo " - TCP............................. yes" +if test "x$have_rpc" = "x0"; then +echo " - RPC............................. no" +else +echo " - RPC............................. yes" +fi +echo " - serial.......................... $have_libserialport" +echo " - VISA............................ $have_librevisa" +echo " - GPIB............................ $have_libgpib" +echo " - USBTMC.......................... $have_libusb1_0" echo +echo "Enabled language bindings:" +echo " - C++............................. $BINDINGS_CXX$final_cxx" +echo " - Python.......................... $BINDINGS_PYTHON$final_python" +echo " - Java............................ $BINDINGS_JAVA$final_java" +echo