X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=2e148b7ef56484a99e45c81db47ba29a3d054626;hb=5089a14345442bb87d0970efc0bc10235a530d60;hp=8a8fa4929ad8c8c868f2a7f5f606f226b1d9df7c;hpb=f5066b2b610b88e7331c4c0d951a94ea4c999b65;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 8a8fa492..2e148b7e 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ # We require at least autoconf 2.63 (AC_INIT format changed there). AC_PREREQ([2.63]) -AC_INIT([libsigrok], [0.5.0], +AC_INIT([libsigrok], [0.6.0], [sigrok-devel@lists.sourceforge.net], [libsigrok], [http://www.sigrok.org]) AC_CONFIG_MACRO_DIR([m4]) @@ -68,7 +68,7 @@ SR_PKG_VERSION_SET([SR_PACKAGE_VERSION], [AC_PACKAGE_VERSION]) # The algorithm for determining which number to change (and how) is nontrivial! # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info # Format: current:revision:age. -SR_LIB_VERSION_SET([SR_LIB_VERSION], [3:0:0]) +SR_LIB_VERSION_SET([SR_LIB_VERSION], [4:0:0]) AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"]) @@ -99,8 +99,7 @@ SR_EXTRA_CXX_LIBS= SR_ARG_OPT_PKG([libserialport], [LIBSERIALPORT], [NEED_SERIAL], [libserialport >= 0.1.1]) -SR_ARG_OPT_PKG([libftdi], [LIBFTDI],, - [libftdi1 >= 1.0], [libftdi >= 0.16]) +SR_ARG_OPT_PKG([libftdi], [LIBFTDI], , [libftdi1 >= 1.0]) # FreeBSD comes with an "integrated" libusb-1.0-style USB API. # This means libusb-1.0 is always available; no need to check for it. @@ -234,12 +233,14 @@ SR_DRIVER([ChronoVu LA], [chronovu-la], [libusb libftdi]) SR_DRIVER([Colead SLM], [colead-slm], [libserialport]) SR_DRIVER([Conrad DIGI 35 CPU], [conrad-digi-35-cpu], [libserialport]) SR_DRIVER([demo], [demo]) +SR_DRIVER([DreamSourceLab DSLogic], [dreamsourcelab-dslogic], [libusb]) SR_DRIVER([Fluke DMM], [fluke-dmm], [libserialport]) SR_DRIVER([FTDI LA], [ftdi-la], [libusb libftdi]) SR_DRIVER([fx2lafw], [fx2lafw], [libusb]) SR_DRIVER([GMC MH 1x/2x], [gmc-mh-1x-2x], [libserialport]) SR_DRIVER([GW Instek GDS-800], [gwinstek-gds-800], [libserialport]) SR_DRIVER([Hameg HMO], [hameg-hmo], [libserialport]) +SR_DRIVER([Hantek 4032L], [hantek-4032l], [libusb]) SR_DRIVER([Hantek 6xxx], [hantek-6xxx], [libusb]) SR_DRIVER([Hantek DSO], [hantek-dso], [libusb]) SR_DRIVER([HP 3457A], [hp-3457a]) @@ -263,6 +264,7 @@ SR_DRIVER([Pipistrello-OLS], [pipistrello-ols], [libftdi]) SR_DRIVER([Rigol DS], [rigol-ds]) SR_DRIVER([Rohde&Schwarz SME-0x], [rohde-schwarz-sme-0x], [libserialport]) SR_DRIVER([Saleae Logic16], [saleae-logic16], [libusb]) +SR_DRIVER([Saleae Logic Pro], [saleae-logic-pro], [libusb]) SR_DRIVER([SCPI PPS], [scpi-pps]) SR_DRIVER([serial DMM], [serial-dmm], [libserialport]) SR_DRIVER([serial LCR], [serial-lcr], [libserialport])