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.in | |
| 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.in')
| -rw-r--r-- | win/configure.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/win/configure.in b/win/configure.in index b0c007a..373cfcc 100644 --- a/win/configure.in +++ b/win/configure.in @@ -129,13 +129,16 @@ AS_IF([test "${enable_shared+set}" = "set"], [ AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}]) AS_IF([test "$do64bit" = "yes"], [ - AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib]) + AS_IF([test "$GCC" == "yes"],[ + AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/libz.dll.a]) + ], [ + 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) ]) AC_DEFINE(HAVE_ZLIB, 1, [Is there an installed zlib?]) |