From: Daniel Elstner <redacted>
Date: Mon, 24 Aug 2015 09:18:09 +0000 (+0200)
Subject: Build: Simplify driver dependency check
X-Git-Tag: libsigrok-0.4.0~404
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=4ed3d9b6db3192ef57c2dccd788c5c6f6e783011;p=libsigrok.git

Build: Simplify driver dependency check
---

diff --git a/configure.ac b/configure.ac
index 7b3b24b1..1c59af06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,6 +149,7 @@ sr_check_driver_deps() {
 		AS_CASE([" $sr_deps_avail "], [*" $sr_dep "*],,
 			[SR_APPEND([sr_deps_missing], [', '], [$sr_dep])])
 	done
+	test -z "$sr_deps_missing" || return 1
 }
 
 AC_ARG_ENABLE([all-drivers],
@@ -163,9 +164,8 @@ m4_define([_SR_DRIVER], [
 		[$3=$enableval], [$3=$enable_all_drivers])
 
 	AS_IF([test "x[$]$3" = xyes], [sr_hw_info=yes[]m4_ifval([$4], [
-		sr_check_driver_deps $4
-		AS_IF([test -n "$sr_deps_missing"],
-			[$3=no sr_hw_info="no (missing: $sr_deps_missing)"])
+		sr_check_driver_deps $4 \
+			|| $3=no sr_hw_info="no (missing: $sr_deps_missing)"
 	])], [sr_hw_info='no (disabled)'])
 	sr_driver_summary_append "$2" "$sr_hw_info"