summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2001-04-03 06:54:51 (GMT)
committerhobbs <hobbs>2001-04-03 06:54:51 (GMT)
commitd2a3481726266c3df9a0ad7763ec0d5b06a44e5f (patch)
tree9767d1534d41ce7d17419e21be51a7e0baf31bb3
parentb65384d6930cbbd32cddfdaf9fde1ca54b898f27 (diff)
downloadtk-d2a3481726266c3df9a0ad7763ec0d5b06a44e5f.zip
tk-d2a3481726266c3df9a0ad7763ec0d5b06a44e5f.tar.gz
tk-d2a3481726266c3df9a0ad7763ec0d5b06a44e5f.tar.bz2
* win/configure:
* win/tcl.m4 (SHLIB_LD): added -incremental:no. [Bug #219381]
-rw-r--r--ChangeLog6
-rwxr-xr-xwin/configure2
-rw-r--r--win/tcl.m42
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 14482f8..2d875e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2001-04-02 Jeff Hobbs <jeffh@ActiveState.com>
+ * win/configure:
+ * win/tcl.m4 (SHLIB_LD): added -incremental:no. [Bug #219381]
+
+ * generic/tkMenu.c (TkInvokeMenu): checked for menu deletion
+ before calling associated menu entry command. [Bug #220821]
+
* doc/image.n: added warning about names chosen for images.
* generic/tkImgPhoto.c (ImgPhotoCmd): corrected the src and dest
diff --git a/win/configure b/win/configure
index 54e81b6..6de24a0 100755
--- a/win/configure
+++ b/win/configure
@@ -1231,7 +1231,7 @@ echo "configure:1192: checking whether $ld_prog supports -shared option" >&5
LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}"
LDFLAGS_WINDOW="-mwindows ${extra_ldflags}"
else
- SHLIB_LD="link -dll -nologo"
+ SHLIB_LD="link -dll -nologo -incremental:no"
SHLIB_LD_LIBS="user32.lib advapi32.lib"
LIBS="user32.lib advapi32.lib"
LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib"
diff --git a/win/tcl.m4 b/win/tcl.m4
index e25a999..dab5f9a 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -441,7 +441,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}"
LDFLAGS_WINDOW="-mwindows ${extra_ldflags}"
else
- SHLIB_LD="link -dll -nologo"
+ SHLIB_LD="link -dll -nologo -incremental:no"
SHLIB_LD_LIBS="user32.lib advapi32.lib"
LIBS="user32.lib advapi32.lib"
LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib"