From: Bert Vermeulen <redacted>
Date: Wed, 11 Jul 2012 10:36:13 +0000 (+0200)
Subject: sr: fix conditional build for ezusb and serial helpers
X-Git-Tag: dsupstream~869
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=28b9dd18611da8e16038d62d58195bdef91552eb;p=libsigrok.git

sr: fix conditional build for ezusb and serial helpers
---

diff --git a/configure.ac b/configure.ac
index 495b3b5c..7118bce2 100644
--- 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 805586c1..e8d670ce 100644
--- 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