Windows: updated test for ws2tcpip.h and windows.h

diff --git a/configure.ac b/configure.ac
index 49d4ef5bf2792248a116d69645a72bc53a1b3a1a..34495bd348f00d2188a624d3b70c6f2e8f2c47a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1143,9 +1143,15 @@ if test "x${enable_eui:=yes}" = "xyes" ; then
   esac
   #Iphlpapi.h check delayed after winsock2.h
   AC_CHECK_HEADERS( \
+    windows.h \
     net/if_dl.h \
     sys/sockio.h \
-    sys/param.h
+    sys/param.h,
+  [], [], [[
+#if HAVE_WINDOWS_H
+include <windows.h>
+endif
+]]
   )
   AC_CHECK_HEADERS( \
     net/if_arp.h \
@@ -2409,8 +2415,7 @@ AC_CHECK_HEADERS( \
   inttypes.h \
   db.h \
   db_185.h \
-  wchar.h \
-  ws2tcpip.h
+  wchar.h
 )
 
 CHECK_STRUCT_PAM_CONV
@@ -2621,7 +2626,13 @@ AC_SEARCH_LIBS([yp_match], [nsl nss_nis nss_nisplus])
 dnl Check for Winsock only on MinGW, on Cygwin we must use emulated BSD socket API
 if test "x$squid_host_os" = "xmingw" ; then
   SQUID_CHECK_WINSOCK_LIB
-  AC_CHECK_HEADERS(Iphlpapi.h,,,[
+  AC_CHECK_HEADERS( \
+    windows.h \
+    ws2tcpip.h \
+    Iphlpapi.h ,,,[
+#if HAVE_WINDOWS_H
+#include <windows.h>
+#endif
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif])