diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-30 20:18:08 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-30 20:18:08 +0200 |
| commit | f4ee528086dcff2b8744544c440853f177956261 (patch) | |
| tree | 3662005de667b49daabd017ae6aaf90364e1f049 /src/auto/configure | |
| parent | 9d489566815d7913afc5dfc2a772bacede3970fb (diff) | |
| download | vim-git-f4ee528086dcff2b8744544c440853f177956261.tar.gz | |
patch 8.2.1327: Mac: configure can't find Tcl librariesv8.2.1327
Problem: Mac: configure can't find Tcl libraries.
Solution: Adjust configure check. (closes #6575)
Diffstat (limited to 'src/auto/configure')
| -rwxr-xr-x | src/auto/configure | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index 41b29c262..54ee35d87 100755 --- 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 |