diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-08-20 14:14:00 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-08-20 14:14:00 (GMT) |
| commit | 6d47648771e23b3c33038a86e89fcaa55af16dba (patch) | |
| tree | 7a0312e58d298d09068fef5d9311e409cd47f771 /win/configure.in | |
| parent | 1e5b4c061fd012e8814dd840bb9bd3f35d742c05 (diff) | |
| parent | 9c36a658376bf2e20c50a154f69ec15762a49391 (diff) | |
| download | tcl-6d47648771e23b3c33038a86e89fcaa55af16dba.zip tcl-6d47648771e23b3c33038a86e89fcaa55af16dba.tar.gz tcl-6d47648771e23b3c33038a86e89fcaa55af16dba.tar.bz2 | |
merge trunk
Diffstat (limited to 'win/configure.in')
| -rw-r--r-- | win/configure.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/win/configure.in b/win/configure.in index 950fca1..9145ff3 100644 --- a/win/configure.in +++ b/win/configure.in @@ -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) |