Merge 8.6

7 files changed, 9 insertions, 21 deletions

diff --git a/unix/configure b/unix/configure
index 426954a..ebc2e50 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5774,7 +5774,6 @@ fi
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    TCL_NEEDS_EXP_FILE=1
-	    TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a'
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
 	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Cygwin version of gcc" >&5
 printf %s "checking for Cygwin version of gcc... " >&6; }
@@ -7161,7 +7160,7 @@ then :
         if test "${SHLIB_SUFFIX}" = ".dll"
 then :
 
-            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'
+            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
             DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
 
 else $as_nop
diff --git a/unix/installManPage b/unix/installManPage
index 86f9860..3d5fa7b 100755
--- a/unix/installManPage
+++ b/unix/installManPage
@@ -5,13 +5,14 @@
 ###
 
 Gzip=:
-SymOrLoc=""
+Sym=""
+Loc=""
 Gz=""
 Suffix=""
 
 while true; do
     case $1 in
-        -s | --symlinks  ) SymOrLoc="-s "      ;;
+        -s | --symlinks  )      Sym="-s "      ;;
         -z | --compress  )     Gzip=$2;  shift ;;
 	-e | --extension )       Gz=$2;  shift ;;
 	-x | --suffix    )   Suffix=$2;  shift ;;
@@ -47,7 +48,7 @@ if test -d "$Dir" ; then : ; else
     echo "target directory must exist"
     exit 1
 fi
-test -z "$SymOrLoc" && SymOrLoc="$Dir/"
+test -z "$Sym" && Loc="$Dir/"
 
 ########################################################################
 ### Extract Target Names from Manual Page
@@ -132,7 +133,7 @@ for Target in $Names; do
 	chmod 644 "$Dir/$First"
 	$Gzip "$Dir/$First"
     else
-	ln $SymOrLoc"$First$Gz" "$Dir/$Target$Gz"
+	ln $Sym"$Loc$First$Gz" "$Dir/$Target$Gz"
     fi
 done
 
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index ecfec69..0aef9cf 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1088,7 +1088,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    TCL_NEEDS_EXP_FILE=1
-	    TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a'
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$[@].a"
 	    AC_CACHE_CHECK(for Cygwin version of gcc,
 		ac_cv_cygwin,
@@ -1805,7 +1804,7 @@ dnl # preprocessing tests use only CPPFLAGS.
         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
         MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
         AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
-            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'
+            INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
             DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
         ], [
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
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@'