# libsigrok package version number (NOT the same as shared lib version!).
m4_define([sr_package_version_major], [0])
-m4_define([sr_package_version_minor], [1])
+m4_define([sr_package_version_minor], [2])
m4_define([sr_package_version_micro], [0])
m4_define([sr_package_version], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro])
# We require at least automake 1.11 (needed for 'silent rules').
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AH_TOP([#ifndef SR_CONFIG_H
#define SR_CONFIG_H /* To stop multiple inclusions. */])
# 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=0
+SR_LIB_VERSION_CURRENT=1
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"
fi
AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
- [enable ASIX Sigma support [default=yes]]),
+ [enable ASIX SIGMA/SIGMA2 support [default=yes]]),
[LA_ASIX_SIGMA="$enableval"],
[LA_ASIX_SIGMA=yes])
AM_CONDITIONAL(LA_ASIX_SIGMA, test x$LA_ASIX_SIGMA = xyes)
if test "x$LA_ASIX_SIGMA" = "xyes"; then
- AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX Sigma support])
+ AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
fi
AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
fi
-# Disabled per default for now, will be enabled when it's tested some more.
AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
- [enable fx2lafw support (for FX2 LAs). [default=no]]),
+ [enable fx2lafw support (for FX2 LAs). [default=yes]]),
[LA_FX2LAFW="$enableval"],
[LA_FX2LAFW=yes])
AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes)
AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support])
fi
+# Disabled by default for now
+AC_ARG_ENABLE(genericdmm, AC_HELP_STRING([--enable-genericdmm],
+ [enable genericdmm support (for most DMMs). [default=no]]),
+ [HW_GENERICDMM="$enableval"],
+ [HW_GENERICDMM=no])
+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(demo, AC_HELP_STRING([--enable-demo],
[enable demo driver support [default=yes]]),
[LA_DEMO="$enableval"],
AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
fi
-AC_ARG_ENABLE(saleae-logic, AC_HELP_STRING([--enable-saleae-logic],
- [enable Saleae Logic support [default=yes]]),
- [LA_SALEAE_LOGIC="$enableval"],
- [LA_SALEAE_LOGIC=no])
-AM_CONDITIONAL(LA_SALEAE_LOGIC, test x$LA_SALEAE_LOGIC = xyes)
-if test "x$LA_SALEAE_LOGIC" = "xyes"; then
- AC_DEFINE(HAVE_LA_SALEAE_LOGIC, 1, [Saleae Logic support])
-fi
-
AC_ARG_ENABLE(zeroplus-logic-cube,
AC_HELP_STRING([--enable-zeroplus-logic-cube],
- [enable Zeroplus Logic Cube support [default=yes]]),
+ [enable ZEROPLUS Logic Cube support [default=yes]]),
[LA_ZEROPLUS_LOGIC_CUBE="$enableval"],
[LA_ZEROPLUS_LOGIC_CUBE=yes])
AM_CONDITIONAL(LA_ZEROPLUS_LOGIC_CUBE, test x$LA_ZEROPLUS_LOGIC_CUBE = xyes)
if test "x$LA_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
- AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [Zeroplus Logic Cube support])
+ AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
+fi
+
+AC_ARG_ENABLE(hantek-dso,
+ AC_HELP_STRING([--enable-hantek-dso],
+ [enable Hantek DSO support [default=yes]]),
+ [HW_HANTEK_DSO="$enableval"],
+ [HW_HANTEK_DSO=yes])
+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
# Checks for libraries.
# 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.22.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).
SR_PKGLIBS="$SR_PKGLIBS gthread-2.0"])
# libusb is only needed for some hardware drivers.
-if test "x$LA_SALEAE_LOGIC" != xno \
- -o "x$LA_ASIX_SIGMA" != xno \
+if test "x$LA_ASIX_SIGMA" != xno \
-o "x$LA_CHRONOVU_LA8" != xno \
-o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno \
-o "x$LA_FX2LAFW" != xno; then
[CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libzip"])
-# zlib is only needed for some hardware drivers.
-if test "x$LA_ASIX_SIGMA" != xno; then
- case "$build" in
- *freebsd*)
- # FreeBSD has zlib, but no pkg-config file for it.
- # Check manually, and do NOT add it to SR_PKGLIBS.
- AC_CHECK_LIB(z, uncompress)
- ;;
- *)
- PKG_CHECK_MODULES([zlib], [zlib >= 1.2.3.1],
- [CFLAGS="$CFLAGS $zlib_CFLAGS"; LIBS="$LIBS $zlib_LIBS";
- SR_PKGLIBS="$SR_PKGLIBS zlib"])
- ;;
- esac
-fi
-
# libftdi is only needed for some hardware drivers.
if test "x$LA_ASIX_SIGMA" != xno \
-o "x$LA_CHRONOVU_LA8" != xno; then
SR_PKGLIBS="$SR_PKGLIBS alsa"])
fi
+# EZUSB FX2 firmware helpers only needed for some hardware drivers
+AM_CONDITIONAL(NEED_EZUSB, \
+ test "x$LA_FX2LAFW" != xno \
+ -o "x$HW_HANTEK_DSO" != xno \
+)
+
+# Serial port helpers only needed for some hardware drivers
+AM_CONDITIONAL(NEED_SERIAL, \
+ test "x$LA_OLS" != xno \
+ -o "x$HW_GENERICDMM" != xno \
+)
+
AC_SUBST(SR_PKGLIBS)
# Checks for header files.
# Checks for library functions.
AC_CHECK_FUNCS([gettimeofday memset strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull])
-AC_SUBST(FIRMWARE_DIR, "$datadir/libsigrok/firmware")
+AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware")
AC_SUBST(MAKEFLAGS, '--no-print-directory')
AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
AC_SUBST(SR_PACKAGE_VERSION)
AC_CONFIG_FILES([Makefile
- sigrok.h
- firmware/Makefile
+ version.h
hardware/Makefile
hardware/alsa/Makefile
hardware/asix-sigma/Makefile
hardware/common/Makefile
hardware/demo/Makefile
hardware/fx2lafw/Makefile
+ hardware/genericdmm/Makefile
hardware/link-mso19/Makefile
hardware/openbench-logic-sniffer/Makefile
- hardware/saleae-logic/Makefile
hardware/zeroplus-logic-cube/Makefile
+ hardware/hantek-dso/Makefile
input/Makefile
output/Makefile
output/text/Makefile
echo
# Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "zlib" "libftdi" "libudev" "alsa"; do
+for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do
if `$PKG_CONFIG --exists $lib`; then
ver=`$PKG_CONFIG --modversion $lib`
answer="yes ($ver)"
echo
echo "Enabled hardware drivers:"
echo
-echo " - ASIX SIGMA...................... $LA_ASIX_SIGMA"
+echo " - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
echo " - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
echo " - Demo driver..................... $LA_DEMO"
echo " - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
+echo " - Generic DMM..................... $HW_GENERICDMM"
echo " - Link MSO-19..................... $LA_LINK_MSO19"
echo " - Openbench Logic Sniffer......... $LA_OLS"
-echo " - Saleae Logic.................... $LA_SALEAE_LOGIC"
-echo " - Zeroplus Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
+echo " - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
+echo " - Hantek DSO...................... $HW_HANTEK_DSO"
echo
projects / libsigrok.git / blobdiff