From 1c183900d2ee1416a0281871928e4064797ee528 Mon Sep 17 00:00:00 2001 From: Marc Schink Date: Sat, 11 Jan 2014 13:55:26 +0100 Subject: [PATCH] configure.ac: Disable atten-pps3xxx driver if libserialport is not found. --- configure.ac | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 128a782c..3fc1cdc4 100644 --- a/configure.ac +++ b/configure.ac @@ -108,10 +108,6 @@ AC_ARG_ENABLE(atten-pps3xxx, AC_HELP_STRING([--enable-atten-pps3xxx], [enable Atten PPS3xxx support [default=yes]]), [HW_ATTEN_PPS3XXX="$enableval"], [HW_ATTEN_PPS3XXX=$HW_ENABLED_DEFAULT]) -AM_CONDITIONAL(HW_ATTEN_PPS3XXX, test x$HW_ATTEN_PPS3XXX = xyes) -if test "x$HW_ATTEN_PPS3XXX" = "xyes"; then - AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support]) -fi AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm], [enable Brymen DMM support [default=yes]]), @@ -288,10 +284,10 @@ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], LIBS="$LIBS $libserialport_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libserialport"], [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="no"; - HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no"; HW_CENTER_3XX="no"; - HW_COLEAD_SLM="no"; HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; - HW_HAMEG_HMO="no"; HW_LINK_MSO19="no"; HW_MIC_985XX="no"; - HW_NORMA_DMM="no"; HW_OLS="no"; HW_RIGOL_DS="no"; + HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no"; + HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_FLUKE_DMM="no"; + HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no"; HW_LINK_MSO19="no"; + HW_MIC_985XX="no"; HW_NORMA_DMM="no"; HW_OLS="no"; HW_RIGOL_DS="no"; HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"]) # Define HAVE_LIBSERIALPORT in config.h if we found libserialport. @@ -392,6 +388,11 @@ if test "x$HW_ASIX_SIGMA" = "xyes"; then AC_DEFINE(HAVE_HW_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support]) fi +AM_CONDITIONAL(HW_ATTEN_PPS3XXX, test x$HW_ATTEN_PPS3XXX = xyes) +if test "x$HW_ATTEN_PPS3XXX" = "xyes"; then + AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support]) +fi + AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes) if test "x$HW_BRYMEN_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support])