X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=a7eb8f569d25cb1306286c069d64a9cbf01c348e;hb=67bd805523f52030a6459786388ce3385be00501;hp=42704ddee441f9fd6d952c890762b036accd3006;hpb=3ba7b61ab23ff61f112206601b8a57a5c5545ae3;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 42704dde..a7eb8f56 100644 --- a/configure.ac +++ b/configure.ac @@ -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,7 +44,7 @@ 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" +CFLAGS="$CFLAGS -Wall -Wextra -Wmissing-prototypes -fvisibility=hidden" # Checks for programs. AC_PROG_CC @@ -94,11 +94,26 @@ AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], [HW_ALSA="$enableval"], [HW_ALSA=$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"], @@ -124,6 +139,11 @@ AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm], [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"], @@ -144,6 +164,11 @@ AC_ARG_ENABLE(gmc-mh-1x-2x, AC_HELP_STRING([--enable-gmc-mh-1x-2x], [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"], @@ -204,6 +229,11 @@ AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm], [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"], @@ -237,6 +267,12 @@ AC_ARG_ENABLE(zeroplus-logic-cube, # 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. @@ -245,6 +281,18 @@ 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 ], + [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(). @@ -262,10 +310,11 @@ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], [have_libserialport="yes"; CFLAGS="$CFLAGS $libserialport_CFLAGS"; LIBS="$LIBS $libserialport_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libserialport"], - [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_BRYMEN_DMM="no"; - HW_CEM_DT_885X="no"; HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; - HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_LINK_MSO19="no"; HW_MIC_985XX="no"; - HW_NORMA_DMM="no"; HW_OLS="no"; HW_RIGOL_DS="no"; + [have_libserialport="no"; 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_LINK_MSO19="no"; + HW_MIC_985XX="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. @@ -277,6 +326,21 @@ 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"; CFLAGS="$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 @@ -288,14 +352,15 @@ case "$host" in [Specifies whether we have a libusb.h header.]) ;; *) - PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], + PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16], [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_UNI_T_UT32X="no"; HW_VICTOR_DMM="no"; + [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"]) # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0. @@ -334,19 +399,12 @@ PKG_CHECK_MODULES([check], [check >= 0.9.4], LIBS="$LIBS $check_LIBS"], [have_check="no"]) AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") -# The Rigol DS 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-ds/--disable-rigol-ds options. - ;; -*) - # Disable the driver for builds that don't target Linux. - HW_RIGOL_DS="no" - ;; +*mingw*) + HW_OLS="no" + ;; esac AC_SUBST(SR_PKGLIBS) @@ -363,11 +421,26 @@ if test "x$HW_ALSA" = "xyes"; then AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver 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]) @@ -393,6 +466,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]) @@ -418,6 +496,11 @@ 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]) @@ -473,6 +556,11 @@ 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]) @@ -505,23 +593,9 @@ fi # 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]) # Checks for typedefs, structures, and compiler characteristics. AC_C_BIGENDIAN -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_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware") AC_SUBST(MAKEFLAGS, '--no-print-directory') @@ -537,46 +611,7 @@ 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/center-3xx/Makefile - hardware/chronovu-la8/Makefile - hardware/colead-slm/Makefile - hardware/common/Makefile - hardware/gmc-mh-1x-2x/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-ds/Makefile - hardware/saleae-logic16/Makefile - hardware/teleinfo/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/norma-dmm/Makefile - hardware/openbench-logic-sniffer/Makefile - hardware/serial-dmm/Makefile - hardware/uni-t-dmm/Makefile - hardware/uni-t-ut32x/Makefile - hardware/zeroplus-logic-cube/Makefile - input/Makefile - output/Makefile - output/text/Makefile - libsigrok.pc - contrib/Makefile - tests/Makefile - ]) +AC_CONFIG_FILES([Makefile version.h libsigrok.pc]) AC_OUTPUT @@ -593,7 +628,7 @@ 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" "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.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib` answer="yes ($ver)" @@ -606,16 +641,21 @@ done echo -e "\nEnabled hardware drivers:\n" echo " - agilent-dmm..................... $HW_AGILENT_DMM" echo " - alsa............................ $HW_ALSA" +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-la8.................... $HW_CHRONOVU_LA8" 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" @@ -628,6 +668,7 @@ 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"