diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-02 19:34:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-02 19:34:00 (GMT) |
| commit | 0472854629fd686353d1250c700382fb829ea2ef (patch) | |
| tree | 496f7c6f4df3077705bce3084b3e19a5ae7198d7 /win | |
| parent | 47f462c33cd417a6f36038282806c5ce0757ba5e (diff) | |
| parent | cca28f5ef38fe8c9c7778d0cb036b5d421d70c75 (diff) | |
| download | tcl-0472854629fd686353d1250c700382fb829ea2ef.zip tcl-0472854629fd686353d1250c700382fb829ea2ef.tar.gz tcl-0472854629fd686353d1250c700382fb829ea2ef.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 4 | ||||
| -rw-r--r-- | win/configure.ac | 3 | ||||
| -rw-r--r-- | win/makefile.vc | 1 | ||||
| -rw-r--r-- | win/tclConfig.sh.in | 7 |
4 files changed, 2 insertions, 13 deletions
diff --git a/win/configure b/win/configure index 9042743..2e97d91 100755 --- a/win/configure +++ b/win/configure @@ -693,7 +693,6 @@ CC_EXENAME CC_OBJNAME DEPARG EXTRA_CFLAGS -CFG_TCL_EXPORT_FILE_SUFFIX CFG_TCL_UNSHARED_LIB_SUFFIX CFG_TCL_SHARED_LIB_SUFFIX TCL_BIN_DIR @@ -5810,11 +5809,9 @@ eval "TCL_INCLUDE_SPEC=\"-I${includedir}\"" TCL_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}" TCL_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" -TCL_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX} CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX} -CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX} #-------------------------------------------------------------------- # Adjust the defines for how the resources are built depending @@ -5882,7 +5879,6 @@ TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d - # win/tcl.m4 doesn't set (CFLAGS) diff --git a/win/configure.ac b/win/configure.ac index b1fb98e..86533cc 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -354,11 +354,9 @@ eval "TCL_INCLUDE_SPEC=\"-I${includedir}\"" TCL_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}" TCL_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" -TCL_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX} CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX} -CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX} #-------------------------------------------------------------------- # Adjust the defines for how the resources are built depending @@ -425,7 +423,6 @@ AC_SUBST(TCL_SRC_DIR) AC_SUBST(TCL_BIN_DIR) AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX) AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX) -AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX) # win/tcl.m4 doesn't set (CFLAGS) AC_SUBST(CFLAGS_DEFAULT) diff --git a/win/makefile.vc b/win/makefile.vc index 89bdb8f..bfe042f 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -775,7 +775,6 @@ $(OUT_DIR)\tclConfig.sh: $(WIN_DIR)\tclConfig.sh.in @TCL_BUILD_STUB_LIB_SPEC@ -L$(OUT_DIR) $(TCLSTUBLIBNAME)
@TCL_BUILD_STUB_LIB_PATH@ $(TCLSTUBLIB)
@TCL_STUB_LIB_PATH@ $(LIB_INSTALL_DIR)\$(TCLSTUBLIBNAME)
-@CFG_TCL_EXPORT_FILE_SUFFIX@ $(VERSION)$(SUFX).lib
@CFG_TCL_SHARED_LIB_SUFFIX@ $(VERSION)$(SUFX).dll
@CFG_TCL_UNSHARED_LIB_SUFFIX@ $(VERSION)$(SUFX).lib
!if $(STATIC_BUILD)
diff --git a/win/tclConfig.sh.in b/win/tclConfig.sh.in index dffa0b6..19af56b 100644 --- a/win/tclConfig.sh.in +++ b/win/tclConfig.sh.in @@ -48,11 +48,8 @@ TCL_ZIP_FILE='@TCL_ZIP_FILE@' # Flag to indicate whether shared libraries need export files. TCL_NEEDS_EXP_FILE=@TCL_NEEDS_EXP_FILE@ -# String that can be evaluated to generate the part of the export file -# name that comes after the "libxxx" (includes version number, if any, -# extension, and anything else needed). May depend on the variables -# VERSION. On most UNIX systems this is ${VERSION}.exp. -TCL_EXPORT_FILE_SUFFIX='@CFG_TCL_EXPORT_FILE_SUFFIX@' +# Deprecated. Same as TCL_UNSHARED_LIB_SUFFIX +TCL_EXPORT_FILE_SUFFIX='@CFG_TCL_UNSHARED_LIB_SUFFIX@' # Additional libraries to use when linking Tcl. TCL_LIBS='@LIBS@' |