Mercurial > vim

diff src/auto/configure @ 21554:13e0857cb114 v8.2.1327

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1327: Mac: configure can't find Tcl libraries Commit: https://github.com/vim/vim/commit/f4ee528086dcff2b8744544c440853f177956261 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 30 20:18:08 2020 +0200 patch 8.2.1327: Mac: configure can't find Tcl libraries Problem: Mac: configure can't find Tcl libraries. Solution: Adjust configure check. (closes https://github.com/vim/vim/issues/6575)
author Bram Moolenaar <Bram@vim.org>
date Thu, 30 Jul 2020 20:30:06 +0200
parents 25cdb1d6585a
children 35921b7fc07a
line wrap: on
line diff
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7417,7 +7417,7 @@ fi
       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 @@ fi
 	  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