summaryrefslogtreecommitdiffstats
path: root/win/configure.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-11-04 16:05:02 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-11-04 16:05:02 (GMT)
commit6131ba244239580b61431e66beb1ef2edcb4dec8 (patch)
tree58e67c48b0da2a77f4adaa47500573146f329178 /win/configure.in
parent5b84b16e1fee2a7da08f3e3a3f0bb7a0ea5a72a8 (diff)
downloadtcl-bug_b5ced5865b.zip
tcl-bug_b5ced5865b.tar.gz
tcl-bug_b5ced5865b.tar.bz2
Proposed workaround for [b5ced5865b]: newer MinGW compilers can link directory to the zlib dll, hopefully older MinGW's which cannot do that are obsolete now. For now, leave 64-bit as-is.bug_b5ced5865b
Diffstat (limited to 'win/configure.in')
-rw-r--r--win/configure.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/win/configure.in b/win/configure.in
index aa47505..3509048 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -135,7 +135,11 @@ AS_IF([test "$tcl_ok" = "yes"], [
AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib])
])
], [
- AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib])
+ AS_IF([test "$GCC" == "yes"],[
+ AC_SUBST(ZLIB_LIBS,["-L. -lz"])
+ ], [
+ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib])
+ ])
])
], [
AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}])