]> sigrok.org Git - libsigrok.git/commitdiff
Build: Simplify driver dependency check
authorDaniel Elstner <redacted>
Mon, 24 Aug 2015 09:18:09 +0000 (11:18 +0200)
committerDaniel Elstner <redacted>
Mon, 24 Aug 2015 18:15:36 +0000 (20:15 +0200)
configure.ac

index 7b3b24b1923e92c52c27bb10139c3de75535df78..1c59af06df92e4ad299b99cdc1bc7305548873c4 100644 (file)
@@ -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"