1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

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>
This commit is contained in:
Martin Storsjö 2013-04-03 15:55:14 +03:00
parent 4d810ad2e9
commit ffb068ce8e

9
configure vendored
View File

@ -489,8 +489,13 @@ enable_deep(){
} }
enable_deep_weak(){ enable_deep_weak(){
do_enable_deep $* for var; do
enable_weak $* disabled $var && continue
pushvar var
do_enable_deep $var
popvar var
enable_weak $var
done
} }
enabled(){ enabled(){