Mercurial > vim
diff src/configure.ac @ 21554:13e0857cb114 v8.2.1327
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/configure.ac +++ b/src/configure.ac @@ -1820,8 +1820,10 @@ if test "$enable_tclinterp" = "yes" -o " 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 " 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