X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c1ca46fe67ed7621ca61aa8f8d95ec1373bc64d6;hb=2379783d85a90bc2930f7eaff348c91b2d60d015;hp=cbe91cf39de17db843a8663db2679752e2b602ee;hpb=81a9ab725f9ce9125c9bc22bc5ebd2903c26bc35;p=libsigrok.git diff --git a/configure.ac b/configure.ac index cbe91cf3..c1ca46fe 100644 --- a/configure.ac +++ b/configure.ac @@ -104,6 +104,11 @@ AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma], [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-dmm, AC_HELP_STRING([--enable-brymen-dmm], [enable Brymen DMM support [default=yes]]), [HW_BRYMEN_DMM="$enableval"], @@ -214,6 +219,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"], @@ -261,6 +271,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(). @@ -279,10 +301,10 @@ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], LIBS="$LIBS $libserialport_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libserialport"], [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="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_HAMEG_HMO="no"; HW_LINK_MSO19="no"; HW_MIC_985XX="no"; - HW_NORMA_DMM="no"; HW_OLS="no"; HW_RIGOL_DS="no"; + HW_ATTEN_PPS3XXX="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_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. @@ -311,7 +333,7 @@ case "$host" in 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_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"]) @@ -383,6 +405,11 @@ 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_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]) @@ -493,6 +520,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]) @@ -562,6 +594,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/alsa/Makefile hardware/appa-55ii/Makefile hardware/asix-sigma/Makefile + hardware/atten-pps3xxx/Makefile hardware/brymen-dmm/Makefile hardware/cem-dt-885x/Makefile hardware/center-3xx/Makefile @@ -577,6 +610,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/mic-985xx/Makefile hardware/rigol-ds/Makefile hardware/saleae-logic16/Makefile + hardware/sysclk-lwla/Makefile hardware/teleinfo/Makefile hardware/tondaj-sl-814/Makefile hardware/victor-dmm/Makefile @@ -630,6 +664,7 @@ 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-dmm...................... $HW_BRYMEN_DMM" echo " - cem-dt-885x..................... $HW_CEM_DT_885X" echo " - center-3xx...................... $HW_CENTER_3XX" @@ -652,6 +687,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"