Module: libav Branch: master Commit: c546147db07d16a76c2fb698d2e8a3057f393475
Author: Diego Biurrun <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Wed Feb 8 18:06:34 2017 +0100 configure: Correctly recurse in do_check_deps() Fixes all sorts of configuration problems introducec by dad7a9c7c0ae on non-Linux or non-vanilla configs. Also removes a line made redundant in that commit. --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index 7d39aca..9ebc3bf 100755 --- a/configure +++ b/configure @@ -612,7 +612,6 @@ is_in(){ do_check_deps(){ for cfg; do - cfg="${cfg#!}" enabled ${cfg}_checking && die "Circular dependency for $cfg." disabled ${cfg}_checking && continue enable ${cfg}_checking @@ -627,7 +626,7 @@ do_check_deps(){ eval dep_ifn="\$${cfg}_if_any" pushvar cfg dep_all dep_any dep_con dep_sel dep_sgs dep_ifa dep_ifn - check_deps $dep_all $dep_any $dep_con $dep_sel $dep_sgs $dep_ifa $dep_ifn + do_check_deps $dep_all $dep_any $dep_con $dep_sel $dep_sgs $dep_ifa $dep_ifn popvar cfg dep_all dep_any dep_con dep_sel dep_sgs dep_ifa dep_ifn [ -n "$dep_ifa" ] && { enabled_all $dep_ifa && enable_weak $cfg; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
