Mercurial > vim

comparison src/configure.ac @ 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
comparison
equal deleted inserted replaced
21553:653fd30f7c53 21554:13e0857cb114
1818 1818
1819 AC_MSG_CHECKING(for location of Tcl include) 1819 AC_MSG_CHECKING(for location of Tcl include)
1820 if test "x$MACOS_X" != "xyes"; then 1820 if test "x$MACOS_X" != "xyes"; then
1821 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" 1821 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
1822 else 1822 else
1823 dnl For all macOS, use the value from TCL in case use of, say, homebrew
1823 dnl For Mac OS X 10.3, use the OS-provided framework location 1824 dnl For Mac OS X 10.3, use the OS-provided framework location
1824 tclinc="/System/Library/Frameworks/Tcl.framework/Headers" 1825 dnl For Mac OS X 10.14, the OS-provided framework location doesn't contain the headers, so also check the Xcode SDK
1826 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"
1825 fi 1827 fi
1826 TCL_INC= 1828 TCL_INC=
1827 for try in $tclinc; do 1829 for try in $tclinc; do
1828 if test -f "$try/tcl.h"; then 1830 if test -f "$try/tcl.h"; then
1829 AC_MSG_RESULT($try/tcl.h) 1831 AC_MSG_RESULT($try/tcl.h)
1839 AC_MSG_CHECKING(for location of tclConfig.sh script) 1841 AC_MSG_CHECKING(for location of tclConfig.sh script)
1840 if test "x$MACOS_X" != "xyes"; then 1842 if test "x$MACOS_X" != "xyes"; then
1841 tclcnf=`echo $tclinc | sed s/include/lib/g` 1843 tclcnf=`echo $tclinc | sed s/include/lib/g`
1842 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" 1844 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
1843 else 1845 else
1846 dnl For all macOS, use the value from TCL in case use of, say, homebrew
1844 dnl For Mac OS X 10.3, use the OS-provided framework location 1847 dnl For Mac OS X 10.3, use the OS-provided framework location
1845 tclcnf="/System/Library/Frameworks/Tcl.framework" 1848 dnl For Mac OS X 10.14, the OS-provided framework location doesn't contain the headers, so also check the Xcode SDK
1849 tclcnf=`echo $tclinc | sed s/include/lib/g`
1850 tclcnf="$tclcnf /System/Library/Frameworks/Tcl.framework `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework"
1846 fi 1851 fi
1847 for try in $tclcnf; do 1852 for try in $tclcnf; do
1848 if test -f "$try/tclConfig.sh"; then 1853 if test -f "$try/tclConfig.sh"; then
1849 AC_MSG_RESULT($try/tclConfig.sh) 1854 AC_MSG_RESULT($try/tclConfig.sh)
1850 . "$try/tclConfig.sh" 1855 . "$try/tclConfig.sh"