[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])
+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
+
AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
[enable Brymen DMM support [default=yes]]),
[HW_BRYMEN_DMM="$enableval"],
# 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.
[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";
+ [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_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"])
[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"],
LIBS="$LIBS $check_LIBS"], [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.
+case "$host" in
+*mingw*)
+ HW_OLS="no"
+ ;;
+esac
+
AC_SUBST(SR_PKGLIBS)
# Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers.
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])
AC_CONFIG_FILES([Makefile version.h hardware/Makefile
hardware/agilent-dmm/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
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" "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 -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-dmm...................... $HW_BRYMEN_DMM"
echo " - cem-dt-885x..................... $HW_CEM_DT_885X"
echo " - center-3xx...................... $HW_CENTER_3XX"