X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=8d87c98fb702b639ed2bcd74d1b890626a66d4cb;hb=6b7ace4832b3b574399098de2ad4f4bd0f35a14e;hp=4f2ef2b0bbde273aa0223f402df9549b26fea906;hpb=e210c6c09003cbd4cfada74c42466ad407c73ad8;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 4f2ef2b0..8d87c98f 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 @@ -22,7 +23,7 @@ AC_PREREQ([2.63]) # 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]) @@ -35,6 +36,7 @@ AC_CONFIG_AUX_DIR([autostuff]) # 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. */]) @@ -62,7 +64,7 @@ PKG_PROG_PKG_CONFIG([0.22]) # 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" @@ -73,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 support]) +fi # Disabled by default, unfinished. AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa], @@ -86,12 +97,12 @@ if test "x$LA_ALSA" = "xyes"; then 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], @@ -103,14 +114,13 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then 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]]), - [LA_FX2LAFW="$enableval"], - [LA_FX2LAFW=yes]) -AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes) -if test "x$LA_FX2LAFW" = "xyes"; then - AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support]) +AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm], + [enable Colead SLM support [default=yes]]), + [HW_COLEAD_SLM="$enableval"], + [HW_COLEAD_SLM=yes]) +AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes) +if test "x$HW_COLEAD_SLM" = "xyes"; then + AC_DEFINE(HAVE_HW_COLEAD_SLM, 1, [Colead SLM support]) fi AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo], @@ -122,6 +132,33 @@ 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"], + [LA_FX2LAFW=yes]) +AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes) +if test "x$LA_FX2LAFW" = "xyes"; then + AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw 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 + # Disabled by default, unfinished. AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19], [enable Link Instruments MSO-19 support [default=no]]), @@ -141,14 +178,59 @@ 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(tondaj-sl-814, AC_HELP_STRING([--enable-tondaj-sl-814], + [enable Tondaj SL-814 support [default=yes]]), + [HW_TONDAJ_SL_814="$enableval"], + [HW_TONDAJ_SL_814=yes]) +AM_CONDITIONAL(HW_TONDAJ_SL_814, test x$HW_TONDAJ_SL_814 = xyes) +if test "x$HW_TONDAJ_SL_814" = "xyes"; then + AC_DEFINE(HAVE_HW_TONDAJ_SL_814, 1, [Tondaj SL-814 support]) +fi + +AC_ARG_ENABLE(uni-t-dmm, AC_HELP_STRING([--enable-uni-t-dmm], + [enable UNI-T DMM support [default=yes]]), + [HW_UNI_T_DMM="$enableval"], + [HW_UNI_T_DMM=yes]) +AM_CONDITIONAL(HW_UNI_T_DMM, test x$HW_UNI_T_DMM = xyes) +if test "x$HW_UNI_T_DMM" = "xyes"; then + AC_DEFINE(HAVE_HW_UNI_T_DMM, 1, [UNI-T DMM support]) +fi + +AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm], + [enable victor-dmm support [default=yes]]), + [HW_VICTOR_DMM="$enableval"], + [HW_VICTOR_DMM=yes]) +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]) +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 # Checks for libraries. @@ -160,7 +242,7 @@ SR_PKGLIBS="" # 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.32.0], [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) # libgthread-2.0 is always needed (e.g. for the demo hardware driver). @@ -171,8 +253,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. @@ -180,7 +263,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"]) @@ -217,6 +300,24 @@ if test "x$LA_ALSA" != xno; then SR_PKGLIBS="$SR_PKGLIBS alsa"]) fi +# EZUSB FX2 firmware helper code is only needed for some hardware drivers. +AM_CONDITIONAL(NEED_EZUSB, \ + test "x$LA_FX2LAFW" != xno \ + -o "x$HW_HANTEK_DSO" != xno \ +) + +# Serial port helper code is only needed for some hardware drivers. +AM_CONDITIONAL(NEED_SERIAL, \ + test "x$HW_AGILENT_DMM" != xno \ + -o "x$HW_COLEAD_SLM" != xno \ + -o "x$HW_FLUKE_DMM" != xno \ + -o "x$LA_LINK_MSO19" != xno \ + -o "x$LA_OLS" != xno \ + -o "x$HW_RADIOSHACK_DMM" != xno \ + -o "x$HW_TEKPOWER_DMM" != xno \ + -o "x$HW_TONDAJ_SL_814" != xno \ +) + AC_SUBST(SR_PKGLIBS) # Checks for header files. @@ -238,7 +339,7 @@ AC_TYPE_SIZE_T # 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') @@ -252,18 +353,25 @@ AC_SUBST(SR_PACKAGE_VERSION_MINOR) AC_SUBST(SR_PACKAGE_VERSION_MICRO) AC_SUBST(SR_PACKAGE_VERSION) -AC_CONFIG_FILES([Makefile - sigrok.h - firmware/Makefile - 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/colead-slm/Makefile hardware/common/Makefile + hardware/tondaj-sl-814/Makefile + hardware/victor-dmm/Makefile + hardware/common/dmm/Makefile hardware/demo/Makefile + hardware/fluke-dmm/Makefile hardware/fx2lafw/Makefile + hardware/hantek-dso/Makefile hardware/link-mso19/Makefile hardware/openbench-logic-sniffer/Makefile + hardware/radioshack-dmm/Makefile + hardware/tekpower-dmm/Makefile + hardware/uni-t-dmm/Makefile hardware/zeroplus-logic-cube/Makefile input/Makefile output/Makefile @@ -295,15 +403,22 @@ 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 " - ASIX SIGMA...................... $LA_ASIX_SIGMA" +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 " - Colead SLM...................... $HW_COLEAD_SLM" echo " - Demo driver..................... $LA_DEMO" +echo " - Fluke DMM....................... $HW_FLUKE_DMM" echo " - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW" +echo " - Hantek DSO...................... $HW_HANTEK_DSO" echo " - Link MSO-19..................... $LA_LINK_MSO19" echo " - Openbench Logic Sniffer......... $LA_OLS" -echo " - Zeroplus Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE" +echo " - Radioshack DMM.................. $HW_RADIOSHACK_DMM" +echo " - TekPower DMM.................... $HW_TEKPOWER_DMM" +echo " - Tondaj SL-814................... $HW_TONDAJ_SL_814" +echo " - UNI-T DMM....................... $HW_UNI_T_DMM" +echo " - victor-dmm...................... $HW_VICTOR_DMM" +echo " - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE" echo