From bf55374d6b9808a15c4d028e1df3fd66b1839f2a Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 17 Jan 2009 00:04:24 +0000
Subject: [PATCH] Another winsock attempt

---
 configure    | 9 +++------
 configure.in | 7 ++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 43275a4815..b25deba9bf 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.676 2009/01/16 22:45:25 kurt Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.677 2009/01/16 22:54:57 kurt Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -15340,7 +15340,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ol_cv_winsock=yes
+  ol_cv_winsock=$curlib
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -15351,10 +15351,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
-	if test $ol_cv_winsock = yes ; then
-	    ol_cv_winsock=$curlib
-	fi
-	break
+	test $ol_cv_winsock != no && break;
 done
 LIBS="$save_LIBS"
 
diff --git a/configure.in b/configure.in
index da3b5b1ce6..e91253de06 100644
--- a/configure.in
+++ b/configure.in
@@ -892,12 +892,9 @@ for curlib in none ws2_32 wsock32; do
 			select(0,NULL,NULL,NULL,NULL);
 			closesocket(0);
 			gethostname(NULL,0);
-			]])],[ol_cv_winsock=yes],[ol_cv_winsock=no])
+			]])],[ol_cv_winsock=$curlib],[ol_cv_winsock=no])
 
-	if test $ol_cv_winsock = yes ; then
-	    ol_cv_winsock=$curlib
-	fi
-	break
+	test $ol_cv_winsock != no && break;
 done
 LIBS="$save_LIBS"
 ])
-- 
2.39.5