aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-12-31 10:11:24 +0200
committerMartin Storsjö <martin@martin.st>2014-01-06 18:55:04 +0200
commit9409c9bdbfd829353473ee6cc3e91c726481c069 (patch)
treed4af65c3621abed6693273dc2880ea0a8205ddb5
parent01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f (diff)
downloadffmpeg-9409c9bdbfd829353473ee6cc3e91c726481c069.tar.gz
configure: Disable networking if winsock2.h is available but winsock functions aren't
Previously, if neither of the checks for the closesocket function succeeded, we still kept winsock2.h and networking in general enabled. When targeting the WinRT API subset, the winsock2.h header is available (making the check for it succeed, giving the impression that winsock is available), but tests that actually try to use such a function will fail. In this case, disable the winsock2.h feature and networking in general, as if the winsock2.h header test would have failed in the first place. Signed-off-by: Martin Storsjö <martin@martin.st>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 7c3a9f87fa..e9fc08c89e 100755
--- a/configure
+++ b/configure
@@ -3776,7 +3776,7 @@ if ! disabled network; then
check_func_headers winsock2.h closesocket -lws2 &&
network_extralibs="-lws2" ||
{ check_func_headers winsock2.h closesocket -lws2_32 &&
- network_extralibs="-lws2_32"; }
+ network_extralibs="-lws2_32"; } || disable winsock2_h network
check_func_headers ws2tcpip.h getaddrinfo $network_extralibs
check_type ws2tcpip.h socklen_t
check_type ws2tcpip.h "struct addrinfo"