patch 8.2.1327: Mac: configure can't find Tcl libraries
Problem: Mac: configure can't find Tcl libraries.
Solution: Adjust configure check. (closes #6575)
diff --git a/src/auto/configure b/src/auto/configure
index 41b29c2..54ee35d 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7417,7 +7417,7 @@
if test "x$MACOS_X" != "xyes"; then
tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
else
- tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
+ tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /System/Library/Frameworks/Tcl.framework/Headers `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework/Versions/Current/Headers"
fi
TCL_INC=
for try in $tclinc; do
@@ -7440,7 +7440,8 @@
tclcnf=`echo $tclinc | sed s/include/lib/g`
tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
else
- tclcnf="/System/Library/Frameworks/Tcl.framework"
+ tclcnf=`echo $tclinc | sed s/include/lib/g`
+ tclcnf="$tclcnf /System/Library/Frameworks/Tcl.framework `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework"
fi
for try in $tclcnf; do
if test -f "$try/tclConfig.sh"; then
diff --git a/src/configure.ac b/src/configure.ac
index 598d73c..054ea1d 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1820,8 +1820,10 @@
if test "x$MACOS_X" != "xyes"; then
tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
else
+ dnl For all macOS, use the value from TCL in case use of, say, homebrew
dnl For Mac OS X 10.3, use the OS-provided framework location
- tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
+ dnl For Mac OS X 10.14, the OS-provided framework location doesn't contain the headers, so also check the Xcode SDK
+ tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /System/Library/Frameworks/Tcl.framework/Headers `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework/Versions/Current/Headers"
fi
TCL_INC=
for try in $tclinc; do
@@ -1841,8 +1843,11 @@
tclcnf=`echo $tclinc | sed s/include/lib/g`
tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
else
+ dnl For all macOS, use the value from TCL in case use of, say, homebrew
dnl For Mac OS X 10.3, use the OS-provided framework location
- tclcnf="/System/Library/Frameworks/Tcl.framework"
+ dnl For Mac OS X 10.14, the OS-provided framework location doesn't contain the headers, so also check the Xcode SDK
+ tclcnf=`echo $tclinc | sed s/include/lib/g`
+ tclcnf="$tclcnf /System/Library/Frameworks/Tcl.framework `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework"
fi
for try in $tclcnf; do
if test -f "$try/tclConfig.sh"; then
diff --git a/src/version.c b/src/version.c
index c37fbe4..806e064 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1327,
+/**/
1326,
/**/
1325,