Skip to content
Snippets Groups Projects
Commit c546147d authored by Diego Biurrun's avatar Diego Biurrun
Browse files

configure: Correctly recurse in do_check_deps()

Fixes all sorts of configuration problems introducec by dad7a9c7
on non-Linux or non-vanilla configs. Also removes a line made redundant
in that commit.
parent 57ec83e4
No related branches found
No related tags found
No related merge requests found
...@@ -612,7 +612,6 @@ is_in(){ ...@@ -612,7 +612,6 @@ is_in(){
do_check_deps(){ do_check_deps(){
for cfg; do for cfg; do
cfg="${cfg#!}"
enabled ${cfg}_checking && die "Circular dependency for $cfg." enabled ${cfg}_checking && die "Circular dependency for $cfg."
disabled ${cfg}_checking && continue disabled ${cfg}_checking && continue
enable ${cfg}_checking enable ${cfg}_checking
...@@ -627,7 +626,7 @@ do_check_deps(){ ...@@ -627,7 +626,7 @@ do_check_deps(){
eval dep_ifn="\$${cfg}_if_any" eval dep_ifn="\$${cfg}_if_any"
pushvar cfg dep_all dep_any dep_con dep_sel dep_sgs dep_ifa dep_ifn 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 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; } [ -n "$dep_ifa" ] && { enabled_all $dep_ifa && enable_weak $cfg; }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment