diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-05 10:23:35 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-05 10:23:35 (GMT) |
commit | a231511532700e5f47dda382a05460a303599cf1 (patch) | |
tree | 45c5189291ed405dc4e3f37a6442048ef2998507 | |
parent | 096f3c3d71040b2812626cd557aa49e7916530bd (diff) | |
parent | 6a8794f0aa0172d329081225303d846a4107524e (diff) | |
download | tcl-a231511532700e5f47dda382a05460a303599cf1.zip tcl-a231511532700e5f47dda382a05460a303599cf1.tar.gz tcl-a231511532700e5f47dda382a05460a303599cf1.tar.bz2 |
Merge 8.7
-rwxr-xr-x | win/configure | 15 | ||||
-rw-r--r-- | win/configure.ac | 14 | ||||
-rw-r--r-- | win/makefile.vc | 1 | ||||
-rw-r--r-- | win/tclConfig.sh.in | 2 |
4 files changed, 31 insertions, 1 deletions
diff --git a/win/configure b/win/configure index 2f0fb9f..a0529b0 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_BUILD_LIB_SPEC MAKE_EXE MAKE_DLL @@ -5894,6 +5895,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 @@ -5975,6 +5989,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 3bfff53..f40871d 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -357,6 +357,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 @@ -437,6 +450,7 @@ AC_SUBST(MAKE_DLL) AC_SUBST(MAKE_EXE) AC_SUBST(TCL_BUILD_LIB_SPEC) +AC_SUBST(TCL_PACKAGE_PATH) # win only AC_SUBST(TCL_DDE_VERSION) diff --git a/win/makefile.vc b/win/makefile.vc index b433635..ed7157f 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -819,6 +819,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 8085d67..c980af6 100644 --- a/win/tclConfig.sh.in +++ b/win/tclConfig.sh.in @@ -144,7 +144,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 |