Add support for fs and ps to sr_parse_period.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2620ccff241f9a06630ddddcd9bddb7c7999bd59..8d87c98fb702b639ed2bcd74d1b890626a66d4cb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -150,15 +150,6 @@ if test "x$LA_FX2LAFW" = "xyes"; then
        AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support])
 fi
 
-AC_ARG_ENABLE(genericdmm, AC_HELP_STRING([--enable-genericdmm],
-             [enable genericdmm support (for most DMMs) [default=yes]]),
-             [HW_GENERICDMM="$enableval"],
-             [HW_GENERICDMM=yes])
-AM_CONDITIONAL(HW_GENERICDMM, test x$HW_GENERICDMM = xyes)
-if test "x$HW_GENERICDMM" = "xyes"; then
-       AC_DEFINE(HAVE_HW_GENERICDMM, 1, [Generic DMM support])
-fi
-
 AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
              [enable Hantek DSO support [default=yes]]),
              [HW_HANTEK_DSO="$enableval"],
@@ -205,6 +196,15 @@ if test "x$HW_TEKPOWER_DMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_TEKPOWER_DMM, 1, [TekPower DMM support])
 fi
 
+AC_ARG_ENABLE(tondaj-sl-814, AC_HELP_STRING([--enable-tondaj-sl-814],
+       [enable Tondaj SL-814 support [default=yes]]),
+       [HW_TONDAJ_SL_814="$enableval"],
+       [HW_TONDAJ_SL_814=yes])
+AM_CONDITIONAL(HW_TONDAJ_SL_814, test x$HW_TONDAJ_SL_814 = xyes)
+if test "x$HW_TONDAJ_SL_814" = "xyes"; then
+       AC_DEFINE(HAVE_HW_TONDAJ_SL_814, 1, [Tondaj SL-814 support])
+fi
+
 AC_ARG_ENABLE(uni-t-dmm, AC_HELP_STRING([--enable-uni-t-dmm],
              [enable UNI-T DMM support [default=yes]]),
              [HW_UNI_T_DMM="$enableval"],
@@ -308,9 +308,14 @@ AM_CONDITIONAL(NEED_EZUSB, \
 
 # Serial port helper code is only needed for some hardware drivers.
 AM_CONDITIONAL(NEED_SERIAL, \
-       test "x$LA_OLS" != xno \
-       -o "x$HW_AGILENT_DMM" != xno \
-       -o "x$HW_GENERICDMM" != xno \
+       test "x$HW_AGILENT_DMM" != xno \
+       -o "x$HW_COLEAD_SLM" != xno \
+       -o "x$HW_FLUKE_DMM" != xno \
+       -o "x$LA_LINK_MSO19" != xno \
+       -o "x$LA_OLS" != xno \
+       -o "x$HW_RADIOSHACK_DMM" != xno \
+       -o "x$HW_TEKPOWER_DMM" != xno \
+       -o "x$HW_TONDAJ_SL_814" != xno \
 )
 
 AC_SUBST(SR_PKGLIBS)
@@ -355,12 +360,12 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/chronovu-la8/Makefile
                 hardware/colead-slm/Makefile
                 hardware/common/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/genericdmm/Makefile
                 hardware/hantek-dso/Makefile
                 hardware/link-mso19/Makefile
                 hardware/openbench-logic-sniffer/Makefile
@@ -406,12 +411,12 @@ echo "  - Colead SLM...................... $HW_COLEAD_SLM"
 echo "  - Demo driver..................... $LA_DEMO"
 echo "  - Fluke DMM....................... $HW_FLUKE_DMM"
 echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
-echo "  - Generic DMM..................... $HW_GENERICDMM"
 echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
 echo "  - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
 echo "  - TekPower DMM.................... $HW_TEKPOWER_DMM"
+echo "  - Tondaj SL-814................... $HW_TONDAJ_SL_814"
 echo "  - UNI-T DMM....................... $HW_UNI_T_DMM"
 echo "  - victor-dmm...................... $HW_VICTOR_DMM"
 echo "  - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"