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 41b29c2623fe845c14b9595dab89dbb2d0806e66..54ee35d87a5d4c84c6a3f7a1dc63a61f9285f626 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7417,7 +7417,7 @@ $as_echo_n "checking for location of Tcl include... " >&6; }
       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 @@ $as_echo_n "checking for location of tclConfig.sh script... " >&6; }
          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 598d73c8dfc49678359855770d9510ce03ec643e..054ea1dcb8d11f2e4c556632d09d14ae9be394bf 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1820,8 +1820,10 @@ if test "$enable_tclinterp" = "yes" -o "$enable_tclinterp" = "dynamic"; then
       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 @@ if test "$enable_tclinterp" = "yes" -o "$enable_tclinterp" = "dynamic"; then
          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 c37fbe46fc281a435d1b5106996486d65ba8563f..806e064f5740e336d2fd6fcc347ded69432f4e04 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1327,
 /**/
     1326,
 /**/