summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xwin/configure4
-rw-r--r--win/tcl.m44
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a98dbc0..971ba9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-03 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/configure, win/tcl.m4 (LIBS_GUI): remove ole32.lib oleaut32.lib
+
2007-12-03 Donal K. Fellows <donal.k.fellows@manchester.ac.uk>
* generic/tclCompCmds.c (TclCompileSwitchCmd): Adjusted the [switch]
diff --git a/win/configure b/win/configure
index 64ecaff..13cc54e 100755
--- a/win/configure
+++ b/win/configure
@@ -3378,7 +3378,7 @@ 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 -lole32 -loleaut32 -luuid"
+ LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid"
STLIB_LD='${AR} cr'
RC_OUT=-o
RC_TYPE=
@@ -3684,7 +3684,7 @@ _ACEOF
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}"
diff --git a/win/tcl.m4 b/win/tcl.m4
index 67e96e9..63b9053 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -447,7 +447,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
SHLIB_LD=""
SHLIB_LD_LIBS=""
LIBS="-lws2_32"
- LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -lole32 -loleaut32 -luuid"
+ LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid"
STLIB_LD='${AR} cr'
RC_OUT=-o
RC_TYPE=
@@ -730,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}"