mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-31 04:26:37 +08:00 
			
		
		
		
	configure: Correctly recurse in do_check_deps()
Fixes all sorts of configuration problems introducec by dad7a9c7c0
on non-Linux or non-vanilla configs. Also removes a line made redundant
in that commit.
			
			
This commit is contained in:
		
							
								
								
									
										3
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								configure
									
									
									
									
										vendored
									
									
								
							| @@ -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; } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Diego Biurrun
					Diego Biurrun