Another winsock attempt

diff --git a/configure b/configure
index 43275a4815f2141cac31263ee66b92f55d633585..b25deba9bf6ace33f6d075bd6cddeb8075011536 100755 (executable)
--- 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 da3b5b1ce61d75b14aa155b504205be4b9626a44..e91253de06f116449a02f3e688aff63c68b810b3 100644 (file)
--- 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"
 ])