X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=7b47ec8efc0ba499c481e494469429eb290cb8f0;hb=883a2e9e71d4d0f84d9f8df6a6a5e754052bad8a;hp=54f8f15db782865c7b08bd5034212e5c6c6885be;hpb=6ac0db19f36ada4cfccf19bbd48ebdb4665bc9ff;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 54f8f15d..7b47ec8e 100644 --- a/configure.ac +++ b/configure.ac @@ -74,13 +74,12 @@ 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. -# Disabled by default AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm], - [enable Agilent DMM driver support [default=no]]), + [enable Agilent DMM driver support [default=yes]]), [HW_AGILENT_DMM="$enableval"], - [HW_AGILENT_DMM=xno]) + [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]) @@ -114,6 +113,15 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 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"], @@ -123,11 +131,10 @@ 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]) @@ -305,6 +312,7 @@ AC_CONFIG_FILES([Makefile hardware/chronovu-la8/Makefile hardware/common/Makefile hardware/demo/Makefile + hardware/fluke-dmm/Makefile hardware/fx2lafw/Makefile hardware/genericdmm/Makefile hardware/link-mso19/Makefile @@ -348,6 +356,7 @@ 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 " - Link MSO-19..................... $LA_LINK_MSO19"