Browse code

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

Måns Rullgård authored on 2010/01/15 03:25:38
Showing 1 changed files
... ...
@@ -450,11 +450,15 @@ check_deps(){
450 450
         eval dep_any="\$${cfg}_deps_any"
451 451
         eval dep_sel="\$${cfg}_select"
452 452
         eval dep_sgs="\$${cfg}_suggest"
453
+        eval dep_ifa="\$${cfg}_if"
454
+        eval dep_ifn="\$${cfg}_if_any"
453 455
 
454
-        pushvar cfg dep_all dep_any dep_sel dep_sgs
455
-        check_deps $dep_all $dep_any $dep_sel $dep_sgs
456
-        popvar cfg dep_all dep_any dep_sel dep_sgs
456
+        pushvar cfg dep_all dep_any dep_sel dep_sgs dep_ifa dep_ifn
457
+        check_deps $dep_all $dep_any $dep_sel $dep_sgs $dep_ifa $dep_ifn
458
+        popvar cfg dep_all dep_any dep_sel dep_sgs dep_ifa dep_ifn
457 459
 
460
+        [ -n "$dep_ifa" ] && { enabled_all $dep_ifa && enable_weak $cfg; }
461
+        [ -n "$dep_ifn" ] && { enabled_any $dep_ifn && enable_weak $cfg; }
458 462
         enabled_all  $dep_all || disable $cfg
459 463
         enabled_any  $dep_any || disable $cfg
460 464
         disabled_any $dep_sel && disable $cfg