summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xwin/configure3
-rw-r--r--win/tcl.m43
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ccb792..a8faf78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-05 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/configure, win/tcl.m4 (LIBS_GUI): mingw needs -lole32
+ -loleaut32 but not msvc for Tk's [send]. [Bug 1844749]
+
2007-12-05 Donal K. Fellows <donal.k.fellows@manchester.ac.uk>
* generic/tclCmdIL.c (Tcl_LsearchObjCmd): Prevent shimmering crash
diff --git a/win/configure b/win/configure
index 13cc54e..6f1929e 100755
--- a/win/configure
+++ b/win/configure
@@ -3378,7 +3378,8 @@ echo "$as_me: WARNING: 64bit mode not supported with GCC on Windows" >&2;}
SHLIB_LD=""
SHLIB_LD_LIBS=""
LIBS="-lws2_32"
- LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid"
+ # mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't
+ LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32"
STLIB_LD='${AR} cr'
RC_OUT=-o
RC_TYPE=
diff --git a/win/tcl.m4 b/win/tcl.m4
index 63b9053..833680f 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -447,7 +447,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
SHLIB_LD=""
SHLIB_LD_LIBS=""
LIBS="-lws2_32"
- LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid"
+ # mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't
+ LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32"
STLIB_LD='${AR} cr'
RC_OUT=-o
RC_TYPE=