diff options
| author | hobbs <hobbs@noemail.net> | 2007-12-03 20:03:38 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2007-12-03 20:03:38 (GMT) |
| commit | 297b52089eeb9a38e39671c0b4fbee90bb6c4a20 (patch) | |
| tree | c77c4baa8237751743ef9a1940aa9f9c963b97c6 /win/tcl.m4 | |
| parent | f26f0cf2d97363c7b2c2797e47539217b002fc91 (diff) | |
| download | tk-297b52089eeb9a38e39671c0b4fbee90bb6c4a20.zip tk-297b52089eeb9a38e39671c0b4fbee90bb6c4a20.tar.gz tk-297b52089eeb9a38e39671c0b4fbee90bb6c4a20.tar.bz2 | |
* win/configure, win/tcl.m4 (LIBS_GUI): remove ole32.lib oleaut32.lib
(LIBS): add ws2_32.lib for static builds with Tcl.
FossilOrigin-Name: 178334ed20f7856c238a32a48fcf3556286a30c3
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -137,7 +137,6 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [ eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\"" AC_SUBST(TCL_VERSION) - AC_SUBST(TCL_PATCH_LEVEL) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_SRC_DIR) @@ -447,8 +446,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ fi SHLIB_LD="" SHLIB_LD_LIBS="" - LIBS="" - LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -lole32 -loleaut32 -luuid" + LIBS="-lws2_32" + LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid" STLIB_LD='${AR} cr' RC_OUT=-o RC_TYPE= @@ -614,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 @@ -628,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 @@ -638,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 @@ -731,7 +730,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ LIBS="$LIBS \"\${CELIB_DIR}/wince-${ARCH}-pocket-wce300-release/celib.lib\"" LIBS_GUI="commctrl.lib commdlg.lib" else - LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib" + LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib" fi SHLIB_LD="${LINKBIN} -dll -incremental:no ${lflags}" |