ITS#3712 skip Winsock detection on Cygwin

diff --git a/configure b/configure
index adb5ab3fb6a21a8f1adce38f3dfe60a8872b4976..6a00e08bf71f7131722de317c106fb89a743ad2c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.578 2005/05/05 20:57:25 hyc Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.579 2005/05/05 22:39:26 hyc Exp  
 
 # This work is part of OpenLDAP Software <http://www.openldap.org/>.
 #
@@ -8976,7 +8976,7 @@ fi
 
 fi
 
-if test "$ac_cv_header_winsock_h" = yes; then
+if test "$ac_cv_cygwin" != yes && "$ac_cv_header_winsock_h" = yes; then
 echo $ac_n "checking for winsock""... $ac_c" 1>&6
 echo "configure:8982: checking for winsock" >&5
 if eval "test \"\${ol_cv_winsock+set}\" = set"; then

diff --git a/configure.in b/configure.in
index 28d5571160305277d1c07b3ef4d28884c7ccff55..bc0dc6f7ad8dee0064ca73b3dc67d68fe6e9b55c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -834,7 +834,9 @@ fi
 dnl The following is INTENTIONALLY scripted out because shell does not
 dnl support variable names with the '@' character, which is what
 dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS
-if test "$ac_cv_header_winsock_h" = yes; then
+dnl
+dnl Skip Winsock tests on Cygwin
+if test "$ac_cv_cygwin" != yes && "$ac_cv_header_winsock_h" = yes; then
 AC_CACHE_CHECK([for winsock], [ol_cv_winsock],
 save_LIBS="$LIBS"
 for curlib in ws2_32 wsock32; do