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.in | |
| 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.in')
| -rw-r--r-- | win/configure.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/win/configure.in b/win/configure.in index d17f815..9145ff3 100644 --- a/win/configure.in +++ b/win/configure.in @@ -14,7 +14,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 @@ -120,7 +120,7 @@ esac # as we just assume that the platform hasn't got a usable z.lib #------------------------------------------------------------------------ -AS_IF([test "$do64bit" = "yes"], [ +AS_IF([test "$do64bit" = "yes" && test "$GCC" != "yes"], [ tcl_ok=no ], [ AS_IF([test "${enable_shared+set}" = "set"], [ @@ -132,7 +132,11 @@ AS_IF([test "${enable_shared+set}" = "set"], [ ]) AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}]) - AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib]) + AS_IF([test "$do64bit" = "yes"], [ + AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib]) + ], [ + AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib]) + ]) ], [ AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}]) AC_DEFINE_UNQUOTED(NO_VIZ, 1) |