diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-01 15:42:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-01 15:42:36 (GMT) |
| commit | 2e364fd375521c1d0b19b0b37949124b3bf497cd (patch) | |
| tree | 68e9a0b9d053db44d70ae77f71afa1afebe6a575 /win/configure.ac | |
| parent | 09e16559af610b93056720ae1fac639ed6e26e19 (diff) | |
| parent | cb7eb97a8df1898896375054b44b9d6519b970e4 (diff) | |
| download | tcl-2e364fd375521c1d0b19b0b37949124b3bf497cd.zip tcl-2e364fd375521c1d0b19b0b37949124b3bf497cd.tar.gz tcl-2e364fd375521c1d0b19b0b37949124b3bf497cd.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/configure.ac')
| -rw-r--r-- | win/configure.ac | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/win/configure.ac b/win/configure.ac index 01f70b4..b1fb98e 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -135,6 +135,8 @@ AS_IF([test "${enable_shared+set}" = "set"], [ ], [ tcl_ok=yes ]) +zlib_lib_name=zdll.lib +tommath_lib_name=tommath.lib AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}]) AC_SUBST(TOMMATH_DLL_FILE,[\${TOMMATH_DLL_FILE}]) @@ -145,6 +147,8 @@ AS_IF([test "$tcl_ok" = "yes"], [ AS_IF([test "$GCC" == "yes"],[ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64-arm/libz.dll.a]) AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64-arm/libtommath.dll.a]) + zlib_lib_name=libz.dll.a + tommath_lib_name=libtommath.dll.a ], [ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64-arm/zdll.lib]) AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64-arm/tommath.lib]) @@ -153,6 +157,8 @@ AS_IF([test "$tcl_ok" = "yes"], [ 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]) + zlib_lib_name=libz.dll.a + tommath_lib_name=libtommath.dll.a ], [ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/zdll.lib]) AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64/tommath.lib]) @@ -167,7 +173,8 @@ AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(TOMMATH_OBJS,[\${TOMMATH_OBJS}]) ]) AC_DEFINE(HAVE_ZLIB, 1, [Is there an installed zlib?]) - +AC_SUBST(TCL_ZLIB_LIB_NAME, $zlib_lib_name) +AC_SUBST(TCL_TOMMATH_LIB_NAME, $tommath_lib_name) AC_CHECK_TYPES([intptr_t, uintptr_t],,,[[ #include <stdint.h> ]]) |