1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00

Merge commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-01-27 19:52:48 +00:00
commit 3662e55943

19
configure vendored
View File

@ -615,7 +615,7 @@ disable_safe(){
do_enable_deep(){ do_enable_deep(){
for var; do for var; do
enabled $var && continue enabled $var && continue
eval sel="\$${var}_select\ \$${var}_select_any" eval sel="\$${var}_select"
eval sgs="\$${var}_suggest" eval sgs="\$${var}_suggest"
pushvar var sgs pushvar var sgs
enable_deep $sel enable_deep $sel
@ -640,11 +640,26 @@ enable_deep_weak(){
done done
} }
do_enable_deep_force(){
for var; do
enabled $var && continue
eval sel="\$${var}_select\ \$${var}_suggest\ \$${var}_select_any"
pushvar var
enable_deep_force $sel
popvar var
done
}
enable_deep_force(){
do_enable_deep_force $*
enable $*
}
request(){ request(){
for var; do for var; do
enable ${var}_requested enable ${var}_requested
done done
enable_deep $* enable_deep_force $*
} }
enabled(){ enabled(){