summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-04-03 15:55:14 +0300
committerMartin Storsjö <martin@martin.st>2013-05-02 22:31:57 +0300
commitffb068ce8e99df121d18a5b9b1d820f3ea8697fb (patch)
tree14447d288166f2f3cd4c67edb7e89ab7f440b2d1 /configure
parent4d810ad2e943a59658ddf00a397121c2b62f7157 (diff)
configure: Don't do enable_deep_weak on disabled variables
This avoids cases where configure tries to weakly enable an item which actually is disabled, ending up still enabling dependencies of the item which itself is only enabled weakly. More concretely, the h264 decoder suggests error resilience, which is then enabled weakly (unless manually disabled). Previously, dsputil, which is a dependency of error resilience, was enabled even if error resilience wasn't enabled in the end. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 7 insertions, 2 deletions
diff --git a/configure b/configure
index f280928442..fd47e53af0 100755
--- a/configure
+++ b/configure
@@ -489,8 +489,13 @@ enable_deep(){
}
enable_deep_weak(){
- do_enable_deep $*
- enable_weak $*
+ for var; do
+ disabled $var && continue
+ pushvar var
+ do_enable_deep $var
+ popvar var
+ enable_weak $var
+ done
}
enabled(){