diff options
| author | Martin Storsjö <martin@martin.st> | 2012-07-16 01:11:18 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-07-16 11:14:19 +0300 |
| commit | f06dee779438d85da6fc1eeca310fd8a19d3b5b7 (patch) | |
| tree | ac8f22ae5512ed9418cb584b274b9c1ac0e4ac03 /configure | |
| parent | 03d1b18e9633667ecf315c1ac804b015fb039e37 (diff) | |
| download | ffmpeg-f06dee779438d85da6fc1eeca310fd8a19d3b5b7.tar.gz | |
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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |