diff options
| author | culler <culler> | 2024-08-12 16:57:17 (GMT) |
|---|---|---|
| committer | culler <culler> | 2024-08-12 16:57:17 (GMT) |
| commit | fa47893682632e88696433b67090a649dcc24348 (patch) | |
| tree | b5f4fd195270199581072b583cc5bb6d8b5f8e49 | |
| parent | 87cb4eebdb80301df8ba37c20751cead3dd45476 (diff) | |
| parent | 80fa1dcec7a0eea982f1d0afd62eb73be4f71335 (diff) | |
| download | tcl-fa47893682632e88696433b67090a649dcc24348.zip tcl-fa47893682632e88696433b67090a649dcc24348.tar.gz tcl-fa47893682632e88696433b67090a649dcc24348.tar.bz2 | |
Fix Tk [1562e10c58]: with macOS framework build, tclsh cannot find Tk if there are multiple versions. Rebuild unix/configure with autoconf 2.72
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/configure.ac | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/unix/configure b/unix/configure index 85e66bc..ab6be48 100755 --- a/unix/configure +++ b/unix/configure @@ -11320,6 +11320,8 @@ fi if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_PACKAGE_PATH" && \ TCL_PACKAGE_PATH="~/Library/Tcl:/Library/Tcl:~/Library/Frameworks:/Library/Frameworks" + # Allow tclsh to find Tk when multiple versions are installed. See Tk [1562e10c58]. + TCL_PACKAGE_PATH="$TCL_PACKAGE_PATH:/Library/Frameworks/Tk.framework/Versions" test -z "$TCL_MODULE_PATH" && \ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" elif test "$prefix/lib" != "$libdir"; then diff --git a/unix/configure.ac b/unix/configure.ac index f1f66be..d2a5771 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -4,7 +4,7 @@ dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. AC_INIT([tcl],[8.7]) -AC_PREREQ([2.69]) +AC_PREREQ([2.72]) dnl This is only used when included from macosx/configure.ac m4_ifdef([SC_USE_CONFIG_HEADERS], [ @@ -893,6 +893,8 @@ AC_SUBST(TCL_BUILDTIME_LIBRARY) if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_PACKAGE_PATH" && \ TCL_PACKAGE_PATH="~/Library/Tcl:/Library/Tcl:~/Library/Frameworks:/Library/Frameworks" + # Allow tclsh to find Tk when multiple versions are installed. See Tk [1562e10c58]. + TCL_PACKAGE_PATH="$TCL_PACKAGE_PATH:/Library/Frameworks/Tk.framework/Versions" test -z "$TCL_MODULE_PATH" && \ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" elif test "$prefix/lib" != "$libdir"; then |