diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-13 13:06:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-13 13:06:34 (GMT) |
| commit | 077504f676c966b4675f7140168f3a115a34af62 (patch) | |
| tree | 236797c3b614da71424e4e076ffa00da0544dd19 /win/configure.ac | |
| parent | d0ff8f4a0d5b408ce2bf828775bff7c85fcb0b14 (diff) | |
| parent | 6fdc83ae1490b9c80fdce1c5fc60af2ce84a08f0 (diff) | |
| download | tcl-077504f676c966b4675f7140168f3a115a34af62.zip tcl-077504f676c966b4675f7140168f3a115a34af62.tar.gz tcl-077504f676c966b4675f7140168f3a115a34af62.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win/configure.ac')
| -rw-r--r-- | win/configure.ac | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/win/configure.ac b/win/configure.ac index 4265ca5..09929de 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -110,8 +110,9 @@ case ${host_alias} in esac #------------------------------------------------------------------------ -# Add stuff for zlib; note that this is mostly done in the makefile now -# as we just assume that the platform hasn't got a usable z.lib +# Add stuff for zlib/libtommath; note that this is mostly done in the +# makefile now as we just assume that the platform hasn't got usable +# z.lib/tommath.lib #------------------------------------------------------------------------ AS_IF([test "${enable_shared+set}" = "set"], [ @@ -122,17 +123,24 @@ AS_IF([test "${enable_shared+set}" = "set"], [ ]) AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}]) + AC_SUBST(TOMMATH_DLL_FILE,[\${TOMMATH_DLL_FILE}]) + AC_DEFINE(TCL_WITH_EXTERNAL_TOMMATH, 1, [Tcl with external libtommath]) AS_IF([test "$do64bit" != "no"], [ + AC_DEFINE(MP_64BIT, 1, [Using libtommath.dll in 64-bit mode]) AS_IF([test "$GCC" == "yes"],[ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a]) + AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64/libtommath.dll.a]) ], [ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/zdll.lib]) + AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64/tommath.lib]) ]) ], [ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win32/zdll.lib]) + AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win32/tommath.lib]) ]) ], [ AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}]) + AC_SUBST(TOMMATH_OBJS,[\${TOMMATH_OBJS}]) ]) AC_DEFINE(HAVE_ZLIB, 1, [Is there an installed zlib?]) |