diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-05-21 20:00:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-05-21 20:00:17 (GMT) |
| commit | 97323bf79bbb53e3df40798e63fb51aeb9b4f177 (patch) | |
| tree | f9fd4fd8f04f715df29cbd3cf30fd054fe8b8269 /win | |
| parent | 7b11e86ea84333b45d79d6e1d1d730279b1f4118 (diff) | |
| parent | 0bd8358dd35a5f6622307115e77879cc0684a188 (diff) | |
| download | tcl-97323bf79bbb53e3df40798e63fb51aeb9b4f177.zip tcl-97323bf79bbb53e3df40798e63fb51aeb9b4f177.tar.gz tcl-97323bf79bbb53e3df40798e63fb51aeb9b4f177.tar.bz2 | |
Add tommath-????/zlib-???? to build-info if libtommath/zlib is statically linked
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 3 | ||||
| -rw-r--r-- | win/configure.ac | 1 | ||||
| -rw-r--r-- | win/makefile.vc | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/win/configure b/win/configure index 8708050..9d7b11c 100755 --- a/win/configure +++ b/win/configure @@ -5017,6 +5017,9 @@ fi else case e in #( e) + +printf "%s\n" "#define TCL_WITH_INTERNAL_ZLIB 1" >>confdefs.h + ZLIB_OBJS=\${ZLIB_OBJS} TOMMATH_OBJS=\${TOMMATH_OBJS} diff --git a/win/configure.ac b/win/configure.ac index 83ed3af..572c3c5 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -155,6 +155,7 @@ AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win32/tommath.lib]) ]) ], [ + AC_DEFINE(TCL_WITH_INTERNAL_ZLIB, 1, [Tcl with internal zlib]) AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}]) AC_SUBST(TOMMATH_OBJS,[\${TOMMATH_OBJS}]) ]) diff --git a/win/makefile.vc b/win/makefile.vc index 13b5396..41872e2 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -472,6 +472,10 @@ LIBTCLVFS = $(OUT_DIR)\$(LIBTCLVFSSUBDIR) PRJ_INCLUDES = -I"$(TOMMATHDIR)"
PRJ_DEFINES = /DTCL_TOMMATH /DMP_PREC=4 /Dinline=__inline /DHAVE_ZLIB=1 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DMP_FIXED_CUTOFFS
+!if $(STATIC_BUILD)
+PRJ_DEFINES = $(PRJ_DEFINES) /DTCL_WITH_INTERNAL_ZLIB
+!endif
+
# Additional Link libraries needed beyond those in rules.vc
PRJ_LIBS = netapi32.lib user32.lib userenv.lib ws2_32.lib
|