diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-08-14 18:00:45 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-08-14 18:00:45 (GMT) |
| commit | a733cde27c904a40aae56e93c7daa369e2a4d045 (patch) | |
| tree | 77fdf9d45381002ae272a660dd3090c4d9459dc5 /win/configure | |
| parent | 133a3b34b7419b202d6588f44871ea67176a5064 (diff) | |
| parent | 2b3657769b1d0b9ae6e10113b1d3c038b4967899 (diff) | |
| download | tcl-a733cde27c904a40aae56e93c7daa369e2a4d045.zip tcl-a733cde27c904a40aae56e93c7daa369e2a4d045.tar.gz tcl-a733cde27c904a40aae56e93c7daa369e2a4d045.tar.bz2 | |
merge trunk
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/win/configure b/win/configure index 0b07e9f..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 @@ -4377,10 +4387,6 @@ else ZLIB_OBJS=\${ZLIB_OBJS} - cat >>confdefs.h <<_ACEOF -#define NO_VIZ 1 -_ACEOF - fi |