Merge 8.6

4 files changed, 31 insertions, 1 deletions

diff --git a/win/configure b/win/configure
index 178d6ff..8dc75ff 100755
--- a/win/configure
+++ b/win/configure
@@ -653,6 +653,7 @@ TCL_REG_VERSION
 TCL_DDE_MINOR_VERSION
 TCL_DDE_MAJOR_VERSION
 TCL_DDE_VERSION
+TCL_PACKAGE_PATH
 TCL_EXP_FILE
 TCL_BUILD_EXP_FILE
 TCL_LD_SEARCH_FLAGS
@@ -5921,6 +5922,19 @@ else
     RC_DEFINES=""
 fi
 
+#--------------------------------------------------------------------
+#	The statements below define the symbol TCL_PACKAGE_PATH, which
+#	gives a list of directories that may contain packages.  The list
+#	consists of one directory for machine-dependent binaries and
+#	another for platform-independent scripts.
+#--------------------------------------------------------------------
+
+if test "$prefix/lib" != "$libdir"; then
+    TCL_PACKAGE_PATH="${libdir};${prefix}\\lib"
+else
+    TCL_PACKAGE_PATH="${prefix}\\lib"
+fi
+
 # The tclsh.exe.manifest requires these
 # TCL_WIN_VERSION is the 4 dotted pair Windows version format which needs
 # the release level, and must account for interim release versioning
@@ -6008,6 +6022,7 @@ TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d
 
 
 
+
 # win only
 
 
diff --git a/win/configure.ac b/win/configure.ac
index 173efbf..2761cfd 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -371,6 +371,19 @@ else
     RC_DEFINES=""
 fi
 
+#--------------------------------------------------------------------
+#	The statements below define the symbol TCL_PACKAGE_PATH, which
+#	gives a list of directories that may contain packages.  The list
+#	consists of one directory for machine-dependent binaries and
+#	another for platform-independent scripts.
+#--------------------------------------------------------------------
+
+if test "$prefix/lib" != "$libdir"; then
+    TCL_PACKAGE_PATH="${libdir};${prefix}\\lib"
+else
+    TCL_PACKAGE_PATH="${prefix}\\lib"
+fi
+
 # The tclsh.exe.manifest requires these
 # TCL_WIN_VERSION is the 4 dotted pair Windows version format which needs
 # the release level, and must account for interim release versioning
@@ -457,6 +470,7 @@ AC_SUBST(TCL_LD_SEARCH_FLAGS)
 AC_SUBST(TCL_BUILD_EXP_FILE)
 AC_SUBST(TCL_EXP_FILE)
 AC_SUBST(DL_LIBS)
+AC_SUBST(TCL_PACKAGE_PATH)
 
 # win only
 AC_SUBST(TCL_DDE_VERSION)
diff --git a/win/makefile.vc b/win/makefile.vc
index 9c5882e..987bcb8 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -821,6 +821,7 @@ $(OUT_DIR)\tclConfig.sh: $(WIN_DIR)\tclConfig.sh.in
 @TCL_LIB_SPEC@       $(LIB_INSTALL_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib

 @TCL_INCLUDE_SPEC@   -I$(INCLUDE_INSTALL_DIR)

 @TCL_SRC_DIR@        $(ROOT)

+@TCL_PACKAGE_PATH@   $(LIB_INSTALL_DIR)

 @TCL_STUB_LIB_FILE@  $(TCLSTUBLIBNAME)

 @TCL_STUB_LIB_FLAG@  $(TCLSTUBLIBNAME)

 @TCL_STUB_LIB_SPEC@  -L$(LIB_INSTALL_DIR) $(TCLSTUBLIBNAME)

diff --git a/win/tclConfig.sh.in b/win/tclConfig.sh.in
index 7228af6..1c33246 100644
--- a/win/tclConfig.sh.in
+++ b/win/tclConfig.sh.in
@@ -152,7 +152,7 @@ TCL_SRC_DIR='@TCL_SRC_DIR@'
 # List of standard directories in which to look for packages during
 # "package require" commands.  Contains the "prefix" directory plus also
 # the "exec_prefix" directory, if it is different.
-TCL_PACKAGE_PATH=''
+TCL_PACKAGE_PATH='@TCL_PACKAGE_PATH@'
 
 # Tcl supports stub.
 TCL_SUPPORTS_STUBS=1