Module: libav
Branch: master
Commit: ffb068ce8e99df121d18a5b9b1d820f3ea8697fb

Author:    Martin Storsjö <[email protected]>
Committer: Martin Storsjö <[email protected]>
Date:      Wed Apr  3 15:55:14 2013 +0300

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ö <[email protected]>

---

 configure |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index f280928..fd47e53 100755
--- a/configure
+++ b/configure
@@ -489,8 +489,13 @@ enable_deep(){
 }
 
 enable_deep_weak(){
-    do_enable_deep $*
-    enable_weak $*
+    for var; do
+        disabled $var && continue
+        pushvar var
+        do_enable_deep $var
+        popvar var
+        enable_weak $var
+    done
 }
 
 enabled(){

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to