summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2001-11-25 01:56:09 (GMT)
committermdejong <mdejong>2001-11-25 01:56:09 (GMT)
commitc3778545e13e2216951950fec35c2283d7ac01b4 (patch)
tree7922af0731c52be1bc2079bd9c8636f15149b52b
parent6f30a681fb64575c78ebdc1542209fb2c0a2c06e (diff)
downloadtcl-c3778545e13e2216951950fec35c2283d7ac01b4.zip
tcl-c3778545e13e2216951950fec35c2283d7ac01b4.tar.gz
tcl-c3778545e13e2216951950fec35c2283d7ac01b4.tar.bz2
* win/configure: Regen.
* win/tcl.m4 (SC_CONFIG_CFLAGS): Add comctl32.lib to wish link libs. This change was originally added to Tk on 2001-11-09 but was not committed to Tcl.
-rw-r--r--ChangeLog7
-rwxr-xr-xwin/configure4
-rw-r--r--win/tcl.m44
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 106a4fe..cfaa9be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-24 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * win/configure: Regen.
+ * win/tcl.m4 (SC_CONFIG_CFLAGS): Add comctl32.lib
+ to wish link libs. This change was originally added
+ to Tk on 2001-11-09 but was not committed to Tcl.
+
2001-11-23 Daniel Steffen <das@users.sourceforge.net>
* unix/Makefile.in:
diff --git a/win/configure b/win/configure
index 5512e52..e097eec 100755
--- a/win/configure
+++ b/win/configure
@@ -1195,7 +1195,7 @@ echo "configure:1191: checking compiler flags" >&5
SHLIB_LD=""
SHLIB_LD_LIBS=""
LIBS=""
- LIBS_GUI="-lgdi32 -lcomdlg32 -limm32"
+ LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32"
STLIB_LD='${AR} cr'
RC_OUT=-o
RC_TYPE=
@@ -1336,7 +1336,7 @@ echo "configure:1191: checking compiler flags" >&5
SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no"
SHLIB_LD_LIBS="user32.lib advapi32.lib"
LIBS="user32.lib advapi32.lib"
- LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib"
+ LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib"
RC_OUT=-fo
RC_TYPE=-r
RC_INCLUDE=-i
diff --git a/win/tcl.m4 b/win/tcl.m4
index 82aeec5..d835e06 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -347,7 +347,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
SHLIB_LD=""
SHLIB_LD_LIBS=""
LIBS=""
- LIBS_GUI="-lgdi32 -lcomdlg32 -limm32"
+ LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32"
STLIB_LD='${AR} cr'
RC_OUT=-o
RC_TYPE=
@@ -488,7 +488,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no"
SHLIB_LD_LIBS="user32.lib advapi32.lib"
LIBS="user32.lib advapi32.lib"
- LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib"
+ LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib"
RC_OUT=-fo
RC_TYPE=-r
RC_INCLUDE=-i