Browse code

configure: add foo_suggest facility

This is like foo_select, except the selected options being disabled
does not disable foo.

Originally committed as revision 15690 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård authored on 2008/10/25 08:18:12
Showing 1 changed files
... ...
@@ -297,8 +297,11 @@ do_enable_deep(){
297 297
     for var; do
298 298
         enabled $var && continue
299 299
         eval sel="\$${var}_select"
300
-        pushvar var
300
+        eval sgs="\$${var}_suggest"
301
+        pushvar var sgs
301 302
         enable_deep $sel
303
+        popvar sgs
304
+        enable_deep_weak $sgs
302 305
         popvar var
303 306
     done
304 307
 }
... ...
@@ -373,10 +376,11 @@ check_deps(){
373 373
         eval dep_all="\$${cfg}_deps"
374 374
         eval dep_any="\$${cfg}_deps_any"
375 375
         eval dep_sel="\$${cfg}_select"
376
+        eval dep_sgs="\$${cfg}_suggest"
376 377
 
377
-        pushvar cfg dep_all dep_any dep_sel
378
-        check_deps $dep_all $dep_any $dep_sel
379
-        popvar cfg dep_all dep_any dep_sel
378
+        pushvar cfg dep_all dep_any dep_sel dep_sgs
379
+        check_deps $dep_all $dep_any $dep_sel $dep_sgs
380
+        popvar cfg dep_all dep_any dep_sel dep_sgs
380 381
 
381 382
         enabled_all  $dep_all || disable $cfg
382 383
         enabled_any  $dep_any || disable $cfg
... ...
@@ -386,6 +390,7 @@ check_deps(){
386 386
             eval dep_extralibs="\$${cfg}_extralibs"
387 387
             test -n "$dep_extralibs" && add_extralibs $dep_extralibs
388 388
             enable_deep $dep_sel
389
+            enable_deep_weak $dep_sgs
389 390
         fi
390 391
 
391 392
         disable ${cfg}_checking