diff options
| author | Daniel Verkamp <daniel@drv.nu> | 2011-01-25 09:28:01 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-26 03:43:30 +0100 |
| commit | 121053b2d62c0dab5d2c681d4d54a2c8da8a4abd (patch) | |
| tree | c29c9b03c62b13462861885d3e8e043f72ccd0d9 | |
| parent | 4fee6f32e2d41395106bc224c4642c26c6e8fa75 (diff) | |
| download | ffmpeg-121053b2d62c0dab5d2c681d4d54a2c8da8a4abd.tar.gz | |
configure: move network tests before results are needed
This moves network_extralibs setup before use so that the link tests
for network functions work correctly.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 54fe299b885109556c72538977f9eefb969a0d87)
| -rwxr-xr-x | configure | 52 |
1 files changed, 26 insertions, 26 deletions
@@ -2683,6 +2683,32 @@ elif check_func dlopen -ldl; then ldl=-ldl fi +if enabled network; then + check_type "sys/types.h sys/socket.h" socklen_t + check_type netdb.h "struct addrinfo" + check_type netinet/in.h "struct ipv6_mreq" -D_DARWIN_C_SOURCE + check_type netinet/in.h "struct sockaddr_in6" + check_type "sys/types.h sys/socket.h" "struct sockaddr_storage" + check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len + # Prefer arpa/inet.h over winsock2 + if check_header arpa/inet.h ; then + check_func closesocket + elif check_header winsock2.h ; then + check_func_headers winsock2.h closesocket -lws2 && \ + network_extralibs="-lws2" || \ + { check_func_headers winsock2.h closesocket -lws2_32 && \ + network_extralibs="-lws2_32"; } + check_type ws2tcpip.h socklen_t + check_type ws2tcpip.h "struct addrinfo" + check_type ws2tcpip.h "struct ipv6_mreq" + check_type ws2tcpip.h "struct sockaddr_in6" + check_type ws2tcpip.h "struct sockaddr_storage" + check_struct winsock2.h "struct sockaddr" sa_len + else + disable network + fi +fi + # Solaris has nanosleep in -lrt, OpenSolaris no longer needs that check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; } @@ -2828,32 +2854,6 @@ fi texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html -if enabled network; then - check_type "sys/types.h sys/socket.h" socklen_t - check_type netdb.h "struct addrinfo" - check_type netinet/in.h "struct ipv6_mreq" -D_DARWIN_C_SOURCE - check_type netinet/in.h "struct sockaddr_in6" - check_type "sys/types.h sys/socket.h" "struct sockaddr_storage" - check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len - # Prefer arpa/inet.h over winsock2 - if check_header arpa/inet.h ; then - check_func closesocket - elif check_header winsock2.h ; then - check_func_headers winsock2.h closesocket -lws2 && \ - network_extralibs="-lws2" || \ - { check_func_headers winsock2.h closesocket -lws2_32 && \ - network_extralibs="-lws2_32"; } - check_type ws2tcpip.h socklen_t - check_type ws2tcpip.h "struct addrinfo" - check_type ws2tcpip.h "struct ipv6_mreq" - check_type ws2tcpip.h "struct sockaddr_in6" - check_type ws2tcpip.h "struct sockaddr_storage" - check_struct winsock2.h "struct sockaddr" sa_len - else - disable network - fi -fi - check_header linux/videodev.h check_header linux/videodev2.h check_header sys/videoio.h |