* win/configure, win/tcl.m4: add ws2_32.lib / -lws2_32 to build.

	* win/tclWinSock.c: remove dyn loading of winsock, assume that it
	is always available now.

1 files changed, 3 insertions, 3 deletions

diff --git a/win/configure b/win/configure
index 4519acc..64ecaff 100755
--- a/win/configure
+++ b/win/configure
@@ -3377,7 +3377,7 @@ echo "$as_me: WARNING: 64bit mode not supported with GCC on Windows" >&2;}
 	fi
 	SHLIB_LD=""
 	SHLIB_LD_LIBS=""
-	LIBS=""
+	LIBS="-lws2_32"
 	LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -lole32 -loleaut32 -luuid"
 	STLIB_LD='${AR} cr'
 	RC_OUT=-o
@@ -3554,6 +3554,7 @@ echo "${ECHO_T}   Using 64-bit $MACHINE mode" >&6
 	    fi
 	fi
 
+	LIBS="user32.lib advapi32.lib ws2_32.lib"
 	if test "$do64bit" != "no" ; then
 	    # The space-based-path will work for the Makefile, but will
 	    # not work if AC_TRY_COMPILE is called.  TEA has the
@@ -3568,7 +3569,7 @@ echo "${ECHO_T}   Using 64-bit $MACHINE mode" >&6
 	    LINKBIN="\"${PATH64}/link.exe\""
 	    # Avoid 'unresolved external symbol __security_cookie' errors.
 	    # c.f. http://support.microsoft.com/?id=894573
-	    LIBS="user32.lib advapi32.lib bufferoverflowU.lib"
+	    LIBS="$LIBS bufferoverflowU.lib"
 	else
 	    RC="rc"
 	    # -Od - no optimization
@@ -3578,7 +3579,6 @@ echo "${ECHO_T}   Using 64-bit $MACHINE mode" >&6
 	    CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}"
 	    lflags="-nologo"
 	    LINKBIN="link"
-	    LIBS="user32.lib advapi32.lib"
 	fi
 
 	if test "$doWince" != "no" ; then