## This file is part of the sigrok project.
##
## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
##
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
# 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])
# 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"
AC_SUBST(SR_LIB_VERSION)
AC_SUBST(SR_LIB_LDFLAGS)
-# Logic analyzer hardware support '--enable' options.
+# Hardware support '--enable' options.
+
+AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm],
+ [enable Agilent DMM driver support [default=yes]]),
+ [HW_AGILENT_DMM="$enableval"],
+ [HW_AGILENT_DMM=yes])
+AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes)
+if test "x$HW_AGILENT_DMM" = "xyes"; then
+ AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM driver support])
+fi
# Disabled by default, unfinished.
AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
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(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm],
+ [Enable Fluke DMM support. [default=yes]]),
+ [HW_FLUKE_DMM="$enableval"],
+ [HW_FLUKE_DMM=yes])
+AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes)
+if test "x$HW_FLUKE_DMM" = "xyes"; then
+ AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support])
+fi
+
+AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm],
+ [Enable Radio Shack 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])
+ fi
+
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
+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(demo, AC_HELP_STRING([--enable-demo],
[enable demo driver support [default=yes]]),
[LA_DEMO="$enableval"],
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).
# libusb is only needed for some hardware drivers.
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
+ -o "x$LA_FX2LAFW" != xno \
+ -o "x$HW_HANTEK_DSO" != xno \
+ -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno; then
case "$build" in
*freebsd*)
# FreeBSD comes with an "integrated" libusb-1.0-style USB API.
[Specifies whether we have a libusb.h header.])
;;
*)
- PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.5],
+ PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
[CFLAGS="$CFLAGS $libusb_CFLAGS";
LIBS="$LIBS $libusb_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"])
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_AGILENT_DMM" != xno \
+ -o "x$HW_GENERICDMM" != xno \
+)
+
AC_SUBST(SR_PKGLIBS)
# Checks for header files.
AC_SUBST(SR_PACKAGE_VERSION)
AC_CONFIG_FILES([Makefile
- sigrok.h
+ version.h
hardware/Makefile
+ hardware/agilent-dmm/Makefile
hardware/alsa/Makefile
hardware/asix-sigma/Makefile
hardware/chronovu-la8/Makefile
hardware/common/Makefile
hardware/demo/Makefile
+ hardware/fluke-dmm/Makefile
+ hardware/radioshack-dmm/Makefile
hardware/fx2lafw/Makefile
+ hardware/genericdmm/Makefile
hardware/link-mso19/Makefile
hardware/openbench-logic-sniffer/Makefile
hardware/zeroplus-logic-cube/Makefile
+ hardware/hantek-dso/Makefile
input/Makefile
output/Makefile
output/text/Makefile
echo
echo "Enabled hardware drivers:"
echo
+echo " - Agilent DMM..................... $HW_AGILENT_DMM"
echo " - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
echo " - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
echo " - Demo driver..................... $LA_DEMO"
+echo " - Fluke DMM....................... $HW_FLUKE_DMM"
+echo " - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
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 " - 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