Merge commit '9409c9bdbfd829353473ee6cc3e91c726481c069'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 21:24:47 +0000 (22:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 21:25:34 +0000 (22:25 +0100)
* commit '9409c9bdbfd829353473ee6cc3e91c726481c069':
  configure: Disable networking if winsock2.h is available but winsock functions aren't

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure

index 1a5856a..1cc9ab1 100755 (executable)
--- 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"