diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-05 16:37:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-05 16:37:52 (GMT) |
| commit | d010f7c3480b092d396c73d872da43257192a475 (patch) | |
| tree | 48d45e13e9c79b85aeddc76a32ca49ce48a9e961 /win/configure.ac | |
| parent | c848a8872a27a167d3eba3391874be66feb637c5 (diff) | |
| download | tcl-d010f7c3480b092d396c73d872da43257192a475.zip tcl-d010f7c3480b092d396c73d872da43257192a475.tar.gz tcl-d010f7c3480b092d396c73d872da43257192a475.tar.bz2 | |
More WIP: All makefile builds appear to work fine, makefile.vc build still to be done.
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 82d713a..aceea8e 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -124,8 +124,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"], [ @@ -136,17 +137,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?]) |