From ffb068ce8e99df121d18a5b9b1d820f3ea8697fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 3 Apr 2013 15:55:14 +0300 Subject: [PATCH] configure: Don't do enable_deep_weak on disabled variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö --- configure | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f280928442..fd47e53af0 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(){