diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2013-06-13 08:31:24 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2013-06-13 08:31:24 (GMT) |
commit | da718e3de736c92c52588c80488ed817dcf74e0b (patch) | |
tree | 60c375f9c8ab25e09c77fd5b3de30c7534336e9e /win/configure | |
parent | c2d32899a05265e34d4c88dc6035c01f866dbfb0 (diff) | |
parent | bea9f0512c400f9cc9b24ad307323cca1a12c995 (diff) | |
download | tcl-da718e3de736c92c52588c80488ed817dcf74e0b.zip tcl-da718e3de736c92c52588c80488ed817dcf74e0b.tar.gz tcl-da718e3de736c92c52588c80488ed817dcf74e0b.tar.bz2 |
merge trunk
Diffstat (limited to 'win/configure')
-rwxr-xr-x | win/configure | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/win/configure b/win/configure index bad344c..fc453f8 100755 --- a/win/configure +++ b/win/configure @@ -4362,7 +4362,17 @@ if test "$tcl_ok" = "yes"; then if test "$do64bit" = "yes"; then - ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib + if test "$GCC" == "yes"; then + + ZLIB_LIBS=\${ZLIB_DIR}/win64/libz.dll.a + + +else + + ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib + + +fi else |