diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-09-19 14:50:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-09-19 14:50:11 (GMT) |
| commit | c57eb3c77c77749299dfec90a74977fa9c5c559b (patch) | |
| tree | b1a93c9472066ad889bb814aa68d0b255123be23 /win/configure | |
| parent | bd029b94a1f825a22bf635e4c255406562741d5b (diff) | |
| parent | 562176ad5a881a5f92f2985feab5401c375d559a (diff) | |
| download | tcl-c57eb3c77c77749299dfec90a74977fa9c5c559b.zip tcl-c57eb3c77c77749299dfec90a74977fa9c5c559b.tar.gz tcl-c57eb3c77c77749299dfec90a74977fa9c5c559b.tar.bz2 | |
merge trunkfrq_3527238
<p>change dde version to 1.4.0b2
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/win/configure b/win/configure index f5a23fe..521fc51 100755 --- a/win/configure +++ b/win/configure @@ -1311,7 +1311,7 @@ SHELL=/bin/sh TCL_VERSION=8.6 TCL_MAJOR_VERSION=8 TCL_MINOR_VERSION=6 -TCL_PATCH_LEVEL="b2" +TCL_PATCH_LEVEL="b3" VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION TCL_DDE_VERSION=1.4 @@ -4344,7 +4344,7 @@ esac # as we just assume that the platform hasn't got a usable z.lib #------------------------------------------------------------------------ -if test "$do64bit" = "yes"; then +if test "$do64bit" = "yes" && test "$GCC" != "yes"; then tcl_ok=no @@ -4368,7 +4368,17 @@ if test "$tcl_ok" = "yes"; then ZLIB_DLL_FILE=\${ZLIB_DLL_FILE} - ZLIB_LIBS=\${ZLIB_DIR}/win32/zdll.lib + if test "$do64bit" = "yes"; then + + ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib + + +else + + ZLIB_LIBS=\${ZLIB_DIR}/win32/zdll.lib + + +fi else |