add VID:PID for generic SILabs F32x USBXpress chips

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2620ccff241f9a06630ddddcd9bddb7c7999bd59..e8d440df96eba099e975a9bf768ee5112cc49858 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ PKG_PROG_PKG_CONFIG([0.22])
 # Carefully read the libtool docs before updating these numbers!
 # The algorithm for determining which number to change (and how) is nontrivial!
 # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-SR_LIB_VERSION_CURRENT=1
+SR_LIB_VERSION_CURRENT=2
 SR_LIB_VERSION_REVISION=0
 SR_LIB_VERSION_AGE=0
 SR_LIB_VERSION="$SR_LIB_VERSION_CURRENT:$SR_LIB_VERSION_REVISION:$SR_LIB_VERSION_AGE"
@@ -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"],
@@ -169,6 +160,15 @@ if test "x$HW_HANTEK_DSO" = "xyes"; then
 fi
 
 # Disabled by default, unfinished.
+AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
+       [enable Lascar EL-USB support [default=yes]]),
+       [HW_LASCAR_EL_USB="$enableval"],
+       [HW_LASCAR_EL_USB=yes])
+AM_CONDITIONAL(HW_LASCAR_EL_USB, test x$HW_LASCAR_EL_USB = xyes)
+if test "x$HW_LASCAR_EL_USB" = "xyes"; then
+       AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support])
+fi
+
 AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
              [enable Link Instruments MSO-19 support [default=no]]),
              [LA_LINK_MSO19="$enableval"],
@@ -187,22 +187,22 @@ if test "x$LA_OLS" = "xyes"; then
        AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
 fi
 
-AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm],
-             [enable RadioShack DMM support [default=yes]]),
-             [HW_RADIOSHACK_DMM="$enableval"],
-             [HW_RADIOSHACK_DMM=yes])
-AM_CONDITIONAL(HW_RADIOSHACK_DMM, test x$HW_RADIOSHACK_DMM = xyes)
-if test "x$HW_RADIOSHACK_DMM" = "xyes"; then
-       AC_DEFINE(HAVE_HW_RADIOSHACK_DMM, 1, [RadioShack DMM support])
+AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
+             [enable serial DMM support [default=yes]]),
+             [HW_SERIAL_DMM="$enableval"],
+             [HW_SERIAL_DMM=yes])
+AM_CONDITIONAL(HW_SERIAL_DMM, test x$HW_SERIAL_DMM = xyes)
+if test "x$HW_SERIAL_DMM" = "xyes"; then
+       AC_DEFINE(HAVE_HW_SERIAL_DMM, 1, [Serial DMM support])
 fi
 
-AC_ARG_ENABLE(tekpower-dmm, AC_HELP_STRING([--enable-tekpower-dmm],
-             [enable TekPower DMM support [default=yes]]),
-             [HW_TEKPOWER_DMM="$enableval"],
-             [HW_TEKPOWER_DMM=yes])
-AM_CONDITIONAL(HW_TEKPOWER_DMM, test x$HW_TEKPOWER_DMM = xyes)
-if test "x$HW_TEKPOWER_DMM" = "xyes"; then
-       AC_DEFINE(HAVE_HW_TEKPOWER_DMM, 1, [TekPower DMM support])
+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],
@@ -242,7 +242,7 @@ SR_PKGLIBS=""
 
 # libglib-2.0 is always needed.
 # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement).
-AM_PATH_GLIB_2_0([2.32.0],
+AM_PATH_GLIB_2_0([2.28.0],
        [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libgthread-2.0 is always needed (e.g. for the demo hardware driver).
@@ -308,9 +308,13 @@ 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_SERIAL_DMM" != xno \
+       -o "x$HW_TONDAJ_SL_814" != xno \
 )
 
 AC_SUBST(SR_PKGLIBS)
@@ -355,17 +359,17 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/chronovu-la8/Makefile
                 hardware/colead-slm/Makefile
                 hardware/common/Makefile
+                hardware/lascar-el-usb/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
-                hardware/radioshack-dmm/Makefile
-                hardware/tekpower-dmm/Makefile
+                hardware/serial-dmm/Makefile
                 hardware/uni-t-dmm/Makefile
                 hardware/zeroplus-logic-cube/Makefile
                 input/Makefile
@@ -406,12 +410,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 "  - Lascar EL-USB................... $HW_LASCAR_EL_USB"
 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 "  - Serial DMM...................... $HW_SERIAL_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"