# 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
[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"],
[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"],
# 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().
[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_HAMEG_HMO="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_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.
# 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
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"])
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])
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])
# 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')
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
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
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.16" "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)"
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"
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"