configure: Move the getaddrinfo function check into the network block
This makes the two checks (general vs winsock) fit in better. Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
		
							parent
							
								
									03d1b18e96
								
							
						
					
					
						commit
						f06dee7794
					
				
							
								
								
									
										4
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								configure
									
									
									
									
										vendored
									
									
								
							@ -2836,6 +2836,7 @@ if enabled network; then
 | 
			
		||||
    check_type "sys/types.h sys/socket.h" "struct sockaddr_storage"
 | 
			
		||||
    check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len
 | 
			
		||||
    check_header netinet/sctp.h
 | 
			
		||||
    check_func getaddrinfo $network_extralibs
 | 
			
		||||
    # Prefer arpa/inet.h over winsock2
 | 
			
		||||
    if check_header arpa/inet.h ; then
 | 
			
		||||
        check_func closesocket
 | 
			
		||||
@ -2844,6 +2845,7 @@ if enabled network; then
 | 
			
		||||
            network_extralibs="-lws2" || \
 | 
			
		||||
        { check_func_headers winsock2.h closesocket -lws2_32 && \
 | 
			
		||||
            network_extralibs="-lws2_32"; }
 | 
			
		||||
        check_func_headers ws2tcpip.h getaddrinfo $network_extralibs
 | 
			
		||||
        check_type ws2tcpip.h socklen_t
 | 
			
		||||
        check_type ws2tcpip.h "struct addrinfo"
 | 
			
		||||
        check_type ws2tcpip.h "struct group_source_req"
 | 
			
		||||
@ -2863,8 +2865,6 @@ check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; }
 | 
			
		||||
 | 
			
		||||
check_func  fcntl
 | 
			
		||||
check_func  fork
 | 
			
		||||
check_func  getaddrinfo $network_extralibs ||
 | 
			
		||||
    check_func_headers ws2tcpip.h getaddrinfo $network_extralibs
 | 
			
		||||
check_func  gethrtime
 | 
			
		||||
check_func  getopt
 | 
			
		||||
check_func  getrusage
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user