summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authorhobbs <hobbs>2007-11-30 01:09:10 (GMT)
committerhobbs <hobbs>2007-11-30 01:09:10 (GMT)
commit10b3f39c05256d03baa5d4ad857c21a4a925d6fe (patch)
tree08b9f870aec14cdcca913c82a9245d5962deb584 /win/tcl.m4
parent2ba9c1b2b70a505b5a12b43810f1ab651c650250 (diff)
downloadtcl-10b3f39c05256d03baa5d4ad857c21a4a925d6fe.zip
tcl-10b3f39c05256d03baa5d4ad857c21a4a925d6fe.tar.gz
tcl-10b3f39c05256d03baa5d4ad857c21a4a925d6fe.tar.bz2
* 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.
Diffstat (limited to 'win/tcl.m4')
-rw-r--r--win/tcl.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index 33076d6..67e96e9 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -446,7 +446,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
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
@@ -613,6 +613,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
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
@@ -627,7 +628,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
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
@@ -637,7 +638,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}"
lflags="-nologo"
LINKBIN="link"
- LIBS="user32.lib advapi32.lib"
fi
if test "$doWince" != "no" ; then