From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 8 Aug 2012 07:39:35 +0000 (-0600)
Subject: Windows: fix winsock detection capabilities
X-Git-Tag: sourceformat-review-1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15d3627133be187b1d186b0d87d724c68a75d779;p=thirdparty%2Fsquid.git

Windows: fix winsock detection capabilities
---

diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4
index af09ac92be..2e6b80632c 100644
--- a/acinclude/os-deps.m4
+++ b/acinclude/os-deps.m4
@@ -242,11 +242,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#if HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
+#elif HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 int main(int argc, char **argv) {
 	FILE *fp = fopen("conftestval", "w");
@@ -422,11 +421,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#if HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
+#elif HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 int main(int argc, char **argv)
 {
@@ -473,11 +471,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#if HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
+#elif HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 int main(int argc, char **argv)
 {
@@ -524,11 +521,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#if HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
+#elif HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 int main(int argc, char **argv)
 {
@@ -579,11 +575,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#if HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
+#elif HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 int main(int argc, char **argv)
 {
@@ -892,8 +887,7 @@ AC_DEFUN([SQUID_CHECK_RECV_ARG_TYPE],[
 #endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
-#endif
-#if HAVE_WINSOCK_H
+#elif HAVE_WINSOCK_H
 #include <winsock.h>
 #endif
 int main (int argc, char ** argv) {