[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_OLS="$enableval"],
[HW_OLS=$HW_ENABLED_DEFAULT])
-AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2],
- [enable Rigol DS1xx2 support [default=yes]]),
- [HW_RIGOL_DS1XX2="$enableval"],
- [HW_RIGOL_DS1XX2=$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]]),
# libserialport is only needed for some hardware drivers. Disable the
# respective drivers if it is not found.
-PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1],
+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_LINK_MSO19="no"; HW_MIC_985XX="no";
- HW_NORMA_DMM="no"; HW_OLS="no"; HW_RIGOL_DS1XX2="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"])
# Define HAVE_LIBSERIALPORT in config.h if we found libserialport.
LIBS="$LIBS $check_LIBS"], [have_check="no"])
AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
-# The Rigol DS1xx2 driver currently uses the Linux kernel usbtmc module
+# 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.
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-ds1xx2/--disable-rigol-ds1xx2 options.
+ # --enable-rigol-ds/--disable-rigol-ds options.
;;
*)
# Disable the driver for builds that don't target Linux.
- HW_RIGOL_DS1XX2="no"
+ HW_RIGOL_DS="no"
;;
esac
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])
AC_DEFINE(HAVE_HW_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
fi
-AM_CONDITIONAL(HW_RIGOL_DS1XX2, test x$HW_RIGOL_DS1XX2 = xyes)
-if test "x$HW_RIGOL_DS1XX2" = "xyes"; then
- AC_DEFINE(HAVE_HW_RIGOL_DS1XX2, 1, [Rigol DS1xx2 support])
+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)
hardware/chronovu-la8/Makefile
hardware/colead-slm/Makefile
hardware/common/Makefile
+ hardware/gmc-mh-1x-2x/Makefile
+ hardware/hameg-hmo/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-ds1xx2/Makefile
+ hardware/rigol-ds/Makefile
hardware/saleae-logic16/Makefile
hardware/teleinfo/Makefile
hardware/tondaj-sl-814/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" "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.9" "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 " - 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 " - mic-985xx....................... $HW_MIC_985XX"
echo " - norma-dmm....................... $HW_NORMA_DMM"
echo " - openbench-logic-sniffer......... $HW_OLS"
-echo " - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
+echo " - rigol-ds........................ $HW_RIGOL_DS"
echo " - saleae-logic16.................. $HW_SALEAE_LOGIC16"
echo " - serial-dmm...................... $HW_SERIAL_DMM"
echo " - teleinfo........................ $HW_TELEINFO"
projects / libsigrok.git / blobdiff