From d9d839dfd7e96725c40cbb71ea3c51465310d8df Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 7 May 2005 21:42:24 +0000 Subject: [PATCH] ITS#3712 skip Winsock detection on Cygwin --- configure | 4 ++-- configure.in | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index adb5ab3fb6..6a00e08bf7 100755 --- 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 . # @@ -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 28d5571160..bc0dc6f7ad 100644 --- 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 -- 2.39.5