summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-06 22:24:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-06 22:25:34 +0100
commit523a803b7352564fcd28ec6d5dc0bfb6f8c5534f (patch)
tree231a37281698cbcff5226d60c76e9a03fbdf1359 /configure
parent00f25e0a990f9200806fc23d9054a47169db69a2 (diff)
parent9409c9bdbfd829353473ee6cc3e91c726481c069 (diff)
Merge commit '9409c9bdbfd829353473ee6cc3e91c726481c069'
* commit '9409c9bdbfd829353473ee6cc3e91c726481c069': configure: Disable networking if winsock2.h is available but winsock functions aren't Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 1a5856af1a..1cc9ab1fe4 100755
--- a/configure
+++ b/configure
@@ -4253,7 +4253,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"