# libsigrok package version number (NOT the same as shared lib version!).
m4_define([sr_package_version_major], [0])
m4_define([sr_package_version_minor], [2])
-m4_define([sr_package_version_micro], [0])
+m4_define([sr_package_version_micro], [1])
m4_define([sr_package_version], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro])
AC_INIT([libsigrok], [sr_package_version], [sigrok-devel@lists.sourceforge.net],
# 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_REVISION=0
+SR_LIB_VERSION_REVISION=1
SR_LIB_VERSION_AGE=0
SR_LIB_VERSION="$SR_LIB_VERSION_CURRENT:$SR_LIB_VERSION_REVISION:$SR_LIB_VERSION_AGE"
SR_LIB_LDFLAGS="-version-info $SR_LIB_VERSION"
AC_ARG_ENABLE(cem-dt-885x, AC_HELP_STRING([--enable-cem-dt-885x],
[enable CEM DT-885x support [default=yes]]),
[HW_CEM_DT_885X="$enableval"],
- [HW_CEM_DT_885X=yes])
+ [HW_CEM_DT_885X=$HW_ENABLED_DEFAULT])
+
+AC_ARG_ENABLE(center-3xx, AC_HELP_STRING([--enable-center-3xx],
+ [enable Center 3xx support [default=yes]]),
+ [HW_CENTER_3XX="$enableval"],
+ [HW_CENTER_3XX=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
[enable ChronoVu LA8 support [default=yes]]),
[HW_HANTEK_DSO=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(ikalogic-scanalogic2, AC_HELP_STRING([--enable-ikalogic-scanalogic2],
- [enable IKALOGIC Scanalogic2 support [default=yes]]),
+ [enable IKALOGIC Scanalogic-2 support [default=yes]]),
[HW_IKALOGIC_SCANALOGIC2="$enableval"],
- [HW_IKALOGIC_SCANALOGIC2=yes])
+ [HW_IKALOGIC_SCANALOGIC2=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(ikalogic-scanaplus, AC_HELP_STRING([--enable-ikalogic-scanaplus],
- [enable Ikalogic ScanaPLUS support [default=yes]]),
+ [enable IKALOGIC ScanaPLUS support [default=yes]]),
[HW_IKALOGIC_SCANAPLUS="$enableval"],
- [HW_IKALOGIC_SCANAPLUS=yes])
+ [HW_IKALOGIC_SCANAPLUS=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(kecheng-kc-330b, AC_HELP_STRING([--enable-kecheng-kc-330b],
[enable Kecheng KC-330B support [default=yes]]),
[HW_KECHENG_KC_330B="$enableval"],
- [HW_KECHENG_KC_330B=yes])
+ [HW_KECHENG_KC_330B=$HW_ENABLED_DEFAULT])
AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
[enable Lascar EL-USB support [default=yes]]),
[HW_RIGOL_DS1XX2="$enableval"],
[HW_RIGOL_DS1XX2=$HW_ENABLED_DEFAULT])
+AC_ARG_ENABLE(saleae-logic16, AC_HELP_STRING([--enable-saleae-logic16],
+ [enable Saleae Logic16 support [default=yes]]),
+ [HW_SALEAE_LOGIC16="$enableval"],
+ [HW_SALEAE_LOGIC16=$HW_ENABLED_DEFAULT])
+
AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
[enable serial DMM support [default=yes]]),
[HW_SERIAL_DMM="$enableval"],
[HW_UNI_T_DMM="$enableval"],
[HW_UNI_T_DMM=$HW_ENABLED_DEFAULT])
+AC_ARG_ENABLE(uni-t-ut32x, AC_HELP_STRING([--enable-uni-t-ut32x],
+ [enable UNI-T UT32x support [default=yes]]),
+ [HW_UNI_T_UT32X="$enableval"],
+ [HW_UNI_T_UT32X=$HW_ENABLED_DEFAULT])
+
AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm],
[enable victor-dmm support [default=yes]]),
[HW_VICTOR_DMM="$enableval"],
[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
# libzip is always needed. Abort if it's not found.
-PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
+PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
[CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libzip"])
LIBS="$LIBS $libusb_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
[have_libusb1_0="no"; HW_FX2LAFW="no"; HW_HANTEK_DSO="no";
- HW_IKALOGIC_SCANALOGIC2="no"; HW_LASCAR_EL_USB="no";
- HW_UNI_T_DMM="no"; HW_VICTOR_DMM="no";
- HW_ZEROPLUS_LOGIC_CUBE="no"])
+ HW_IKALOGIC_SCANALOGIC2="no"; HW_KECHENG_KC_330B="no";
+ HW_LASCAR_EL_USB="no";
+ HW_UNI_T_DMM="no"; HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no";
+ HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"])
# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
if test "x$have_libusb1_0" != "xno"; then
[CFLAGS="$CFLAGS $libftdi_CFLAGS";
LIBS="$LIBS $libftdi_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libftdi"],
- [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="no"])
+ [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="no"; HW_IKALOGIC_SCANAPLUS="no"])
# libudev is only needed for some hardware drivers. Disable them if not found.
PKG_CHECK_MODULES([libudev], [libudev >= 151],
AC_DEFINE(HAVE_HW_CEM_DT_885X, 1, [CEM DT-885x support])
fi
+AM_CONDITIONAL(HW_CENTER_3XX, test x$HW_CENTER_3XX = xyes)
+if test "x$HW_CENTER_3XX" = "xyes"; then
+ AC_DEFINE(HAVE_HW_CENTER_3XX, 1, [Center 3xx support])
+fi
+
AM_CONDITIONAL(HW_CHRONOVU_LA8, test x$HW_CHRONOVU_LA8 = xyes)
if test "x$HW_CHRONOVU_LA8" = "xyes"; then
AC_DEFINE(HAVE_HW_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
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 Scanalogic2 support])
+ AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [IKALOGIC Scanalogic-2 support])
fi
AM_CONDITIONAL(HW_IKALOGIC_SCANAPLUS, test x$HW_IKALOGIC_SCANAPLUS = xyes)
if test "x$HW_IKALOGIC_SCANAPLUS" = "xyes"; then
- AC_DEFINE(HAVE_HW_IKALOGIC_SCANAPLUS, 1, [Ikalogic ScanaPLUS support])
+ AC_DEFINE(HAVE_HW_IKALOGIC_SCANAPLUS, 1, [IKALOGIC ScanaPLUS support])
fi
AM_CONDITIONAL(HW_KECHENG_KC_330B, test x$HW_KECHENG_KC_330B = xyes)
AC_DEFINE(HAVE_HW_UNI_T_DMM, 1, [UNI-T DMM support])
fi
+AM_CONDITIONAL(HW_UNI_T_UT32X, test x$HW_UNI_T_UT32X = xyes)
+if test "x$HW_UNI_T_UT32X" = "xyes"; then
+ AC_DEFINE(HAVE_HW_UNI_T_UT32X, 1, [UNI-T UT32x support])
+fi
+
AM_CONDITIONAL(HW_VICTOR_DMM, test x$HW_VICTOR_DMM = xyes)
if test "x$HW_VICTOR_DMM" = "xyes"; then
AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [Victor DMM support])
AC_DEFINE(HAVE_HW_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
fi
+AM_CONDITIONAL(HW_SALEAE_LOGIC16, test x$HW_SALEAE_LOGIC16 = xyes)
+if test "x$HW_SALEAE_LOGIC16" = "xyes"; then
+ AC_DEFINE(HAVE_HW_SALEAE_LOGIC16, 1, [Saleae Logic16 support])
+fi
+
# Checks for header files.
# These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
AC_CHECK_HEADERS([fcntl.h sys/time.h termios.h])
# Checks for typedefs, structures, and compiler characteristics.
+AC_C_BIGENDIAN
AC_C_INLINE
AC_TYPE_INT8_T
AC_TYPE_INT16_T
hardware/asix-sigma/Makefile
hardware/brymen-dmm/Makefile
hardware/cem-dt-885x/Makefile
+ hardware/center-3xx/Makefile
hardware/chronovu-la8/Makefile
hardware/colead-slm/Makefile
hardware/common/Makefile
hardware/lascar-el-usb/Makefile
hardware/mic-985xx/Makefile
hardware/rigol-ds1xx2/Makefile
+ hardware/saleae-logic16/Makefile
hardware/tondaj-sl-814/Makefile
hardware/victor-dmm/Makefile
hardware/common/dmm/Makefile
hardware/openbench-logic-sniffer/Makefile
hardware/serial-dmm/Makefile
hardware/uni-t-dmm/Makefile
+ hardware/uni-t-ut32x/Makefile
hardware/zeroplus-logic-cube/Makefile
input/Makefile
output/Makefile
echo
# Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.8" "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" "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 " - asix-sigma...................... $HW_ASIX_SIGMA"
echo " - brymen-dmm...................... $HW_BRYMEN_DMM"
echo " - cem-dt-885x..................... $HW_CEM_DT_885X"
+echo " - center-3xx...................... $HW_CENTER_3XX"
echo " - chronovu-la8.................... $HW_CHRONOVU_LA8"
echo " - colead-slm...................... $HW_COLEAD_SLM"
echo " - demo............................ $HW_DEMO"
echo " - mic-985xx....................... $HW_MIC_985XX"
echo " - openbench-logic-sniffer......... $HW_OLS"
echo " - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
+echo " - saleae-logic16.................. $HW_SALEAE_LOGIC16"
echo " - serial-dmm...................... $HW_SERIAL_DMM"
echo " - tondaj-sl-814................... $HW_TONDAJ_SL_814"
echo " - uni-t-dmm....................... $HW_UNI_T_DMM"
+echo " - uni-t-ut32x..................... $HW_UNI_T_UT32X"
echo " - victor-dmm...................... $HW_VICTOR_DMM"
echo " - zeroplus-logic-cube............. $HW_ZEROPLUS_LOGIC_CUBE"
echo
projects / libsigrok.git / blobdiff