X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=496f96f9f1900ced9e6eed4a449cf64b71dc66b0;hb=7dc55d930f87433fb35ebf6f18f767eddb7e8a17;hp=7118bce28709903784cb0d9e8d82be04b283bb98;hpb=28b9dd18611da8e16038d62d58195bdef91552eb;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 7118bce2..496f96f9 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ ## This file is part of the sigrok project. ## ## Copyright (C) 2010-2012 Bert Vermeulen +## Copyright (C) 2012 Alexandru Gagniuc ## ## 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 @@ -74,7 +75,16 @@ AC_SUBST(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 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], @@ -104,6 +114,24 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support]) fi +AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo], + [enable demo driver support [default=yes]]), + [LA_DEMO="$enableval"], + [LA_DEMO=yes]) +AM_CONDITIONAL(LA_DEMO, test x$LA_DEMO = xyes) +if test "x$LA_DEMO" = "xyes"; then + AC_DEFINE(HAVE_LA_DEMO, 1, [Demo driver support]) +fi + +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(fx2lafw, AC_HELP_STRING([--enable-fx2lafw], [enable fx2lafw support (for FX2 LAs). [default=yes]]), [LA_FX2LAFW="$enableval"], @@ -113,23 +141,23 @@ if test "x$LA_FX2LAFW" = "xyes"; then 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]]), + [enable genericdmm support (for most DMMs). [default=yes]]), [HW_GENERICDMM="$enableval"], - [HW_GENERICDMM=no]) + [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"], - [LA_DEMO=yes]) -AM_CONDITIONAL(LA_DEMO, test x$LA_DEMO = xyes) -if test "x$LA_DEMO" = "xyes"; then - AC_DEFINE(HAVE_LA_DEMO, 1, [Demo driver support]) +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 # Disabled by default, unfinished. @@ -151,6 +179,24 @@ 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]) +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]) +fi + AC_ARG_ENABLE(zeroplus-logic-cube, AC_HELP_STRING([--enable-zeroplus-logic-cube], [enable ZEROPLUS Logic Cube support [default=yes]]), @@ -161,26 +207,6 @@ if test "x$LA_ZEROPLUS_LOGIC_CUBE" = "xyes"; then 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 - -AC_ARG_ENABLE(mastech-va18b, - AC_HELP_STRING([--enable-mastech-va18b], - [enable Mastech VA18B support [default=no]]), - [HW_MASTECH_VA18B="$enableval"], - [HW_MASTECH_VA18B=no]) -AM_CONDITIONAL(HW_MASTECH_VA18B, test x$HW_MASTECH_VA18B = xyes) -if test "x$HW_MASTECH_VA18B" = "xyes"; then - AC_DEFINE(HAVE_HW_MASTECH_VA18B, 1, [Mastech VA18B support]) -fi - # Checks for libraries. # This variable collects the pkg-config names of all detected libs. @@ -201,8 +227,9 @@ PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0], # 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. @@ -210,7 +237,7 @@ if test "x$LA_ASIX_SIGMA" != xno \ [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"]) @@ -256,6 +283,7 @@ AM_CONDITIONAL(NEED_EZUSB, \ # 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 \ ) @@ -294,21 +322,22 @@ AC_SUBST(SR_PACKAGE_VERSION_MINOR) AC_SUBST(SR_PACKAGE_VERSION_MICRO) AC_SUBST(SR_PACKAGE_VERSION) -AC_CONFIG_FILES([Makefile - version.h - hardware/Makefile +AC_CONFIG_FILES([Makefile 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/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/zeroplus-logic-cube/Makefile - hardware/hantek-dso/Makefile - hardware/mastech-va18b/Makefile input/Makefile output/Makefile output/text/Makefile @@ -339,18 +368,19 @@ for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "a echo " - $lib: $answer" done -echo -echo "Enabled hardware drivers:" -echo +echo -e "\nEnabled hardware drivers:\n" +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 " - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW" echo " - Generic DMM..................... $HW_GENERICDMM" +echo " - Hantek DSO...................... $HW_HANTEK_DSO" 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 " - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE" -echo " - Hantek DSO...................... $HW_HANTEK_DSO" -echo " - Mastech VA18B................... $HW_MASTECH_VA18B" echo