Fix winsock test to properly use cache

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index d8a7e8ed4865f8210e9a5c68928745b976465797..779593b110ce15e39d39594b3c888281d2016b56 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -878,7 +878,7 @@ 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
-AC_CACHE_CHECK([for winsock], [ol_cv_winsock],
+AC_CACHE_CHECK([for winsock], [ol_cv_winsock],[
 save_LIBS="$LIBS"
 for curlib in ws2_32 wsock32; do
        LIBS="$LIBS -l$curlib"
@@ -890,21 +890,26 @@ for curlib in ws2_32 wsock32; do
                        gethostname(NULL,0);
                        ]])],[ol_cv_winsock=yes],[ol_cv_winsock=no])
 
-       if test $ol_cv_winsock = yes; then
-               AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
-               ac_cv_func_socket=yes
-               ac_cv_func_select=yes
-               ac_cv_func_closesocket=yes
-               ac_cv_func_gethostname=yes
-               if test $curlib = ws2_32; then
+       if test $ol_cv_winsock = yes ; then
+               if test -a $curlib = ws2_32; then
                        ol_cv_winsock=winsock2
-                       AC_DEFINE(HAVE_WINSOCK2, 1,
-                                 [define if you have winsock2])
                fi
                break
        fi
+
        LIBS="$save_LIBS"
-done)
+done
+])
+if test $ol_cv_winsock != no ; then
+    AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
+    ac_cv_func_socket=yes
+    ac_cv_func_select=yes
+    ac_cv_func_closesocket=yes
+    ac_cv_func_gethostname=yes
+
+    if test $ol_cv_winock = winsock2 ; then
+       AC_DEFINE(HAVE_WINSOCK2, 1, [define if you have winsock2])
+    fi
 fi
 
 dnl Find socket()