sr: fix conditional build for ezusb and serial helpers

diff --git a/configure.ac b/configure.ac
index 495b3b5ce570a1e500e559b5613aa4278b1f27b5..7118bce28709903784cb0d9e8d82be04b283bb98 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -247,6 +247,18 @@ if test "x$LA_ALSA" != xno; then
                SR_PKGLIBS="$SR_PKGLIBS alsa"])
 fi
 
+# EZUSB FX2 firmware helpers only needed for some hardware drivers
+AM_CONDITIONAL(NEED_EZUSB, \
+       test "x$LA_FX2LAFW" != xno \
+       -o "x$HW_HANTEK_DSO" != xno \
+)
+
+# Serial port helpers only needed for some hardware drivers
+AM_CONDITIONAL(NEED_SERIAL, \
+       test "x$LA_OLS" != xno \
+       -o "x$HW_GENERICDMM" != xno \
+)
+
 AC_SUBST(SR_PKGLIBS)
 
 # Checks for header files.

diff --git a/hardware/common/Makefile.am b/hardware/common/Makefile.am
index 805586c1ad6485e40fe9bfe9a37d681ac42fe4c3..e8d670ce28733a704dbb40259a3b44a9b8e9b939 100644 (file)
--- a/hardware/common/Makefile.am
+++ b/hardware/common/Makefile.am
@@ -22,11 +22,11 @@ noinst_LTLIBRARIES = libsigrokhwcommon.la
 
 libsigrokhwcommon_la_SOURCES =
 
-if LA_FX2LAFW
+if NEED_EZUSB
 libsigrokhwcommon_la_SOURCES += ezusb.c
 endif
 
-if LA_OLS
+if NEED_SERIAL
 libsigrokhwcommon_la_SOURCES += serial.c
 endif