diff options
author | Måns Rullgård <mans@mansr.com> | 2010-01-14 18:25:38 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2010-01-14 18:25:38 +0000 |
commit | 3d7453e05688af4600776ef75043b6ef64d7f1af (patch) | |
tree | c36571af7f3d394c78d84e34f43af0d77269d04c | |
parent | 29b75f0b673d92364c57bf3926a8b9168ea0a05b (diff) | |
download | ffmpeg-3d7453e05688af4600776ef75043b6ef64d7f1af.tar.gz |
configure: allow reverse auto-selection of options
This adds the possibility to set foo_if and foo_if_any variables,
causing foo to be enabled if all/any of the listed options are
enabled.
Originally committed as revision 21215 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-x | configure | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -450,11 +450,15 @@ check_deps(){ eval dep_any="\$${cfg}_deps_any" eval dep_sel="\$${cfg}_select" eval dep_sgs="\$${cfg}_suggest" + eval dep_ifa="\$${cfg}_if" + eval dep_ifn="\$${cfg}_if_any" - pushvar cfg dep_all dep_any dep_sel dep_sgs - check_deps $dep_all $dep_any $dep_sel $dep_sgs - popvar cfg dep_all dep_any dep_sel dep_sgs + pushvar cfg dep_all dep_any dep_sel dep_sgs dep_ifa dep_ifn + check_deps $dep_all $dep_any $dep_sel $dep_sgs $dep_ifa $dep_ifn + popvar cfg dep_all dep_any dep_sel dep_sgs dep_ifa dep_ifn + [ -n "$dep_ifa" ] && { enabled_all $dep_ifa && enable_weak $cfg; } + [ -n "$dep_ifn" ] && { enabled_any $dep_ifn && enable_weak $cfg; } enabled_all $dep_all || disable $cfg enabled_any $dep_any || disable $cfg disabled_any $dep_sel && disable $cfg |