Best regards,
Marc
>From 238139d6d6d88ac3058591bbfb8479f6dc7685fa Mon Sep 17 00:00:00 2001
From: Marc Schink <[email protected]>
Date: Sat, 11 Jan 2014 13:44:45 +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 128a782..3fc1cdc 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])
--
1.8.1.2
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
sigrok-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
