diff options
author | Diego Biurrun <diego@biurrun.de> | 2017-02-08 18:06:34 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2017-02-08 21:23:41 +0100 |
commit | c546147db07d16a76c2fb698d2e8a3057f393475 (patch) | |
tree | aea7071b3aef86f1d9b436cbdf906f2ac781e8f5 /configure | |
parent | 57ec83e4246b21c2f0c068b9151d806737d4497f (diff) | |
download | ffmpeg-streaming-c546147db07d16a76c2fb698d2e8a3057f393475.zip ffmpeg-streaming-c546147db07d16a76c2fb698d2e8a3057f393475.tar.gz |
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.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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; } |