Mercurial > vim
comparison src/auto/configure @ 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 |
comparison
equal
deleted
inserted
replaced
21553:653fd30f7c53 | 21554:13e0857cb114 |
---|---|
7415 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 | 7415 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 |
7416 $as_echo_n "checking for location of Tcl include... " >&6; } | 7416 $as_echo_n "checking for location of Tcl include... " >&6; } |
7417 if test "x$MACOS_X" != "xyes"; then | 7417 if test "x$MACOS_X" != "xyes"; then |
7418 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" | 7418 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" |
7419 else | 7419 else |
7420 tclinc="/System/Library/Frameworks/Tcl.framework/Headers" | 7420 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" |
7421 fi | 7421 fi |
7422 TCL_INC= | 7422 TCL_INC= |
7423 for try in $tclinc; do | 7423 for try in $tclinc; do |
7424 if test -f "$try/tcl.h"; then | 7424 if test -f "$try/tcl.h"; then |
7425 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tcl.h" >&5 | 7425 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tcl.h" >&5 |
7438 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } | 7438 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } |
7439 if test "x$MACOS_X" != "xyes"; then | 7439 if test "x$MACOS_X" != "xyes"; then |
7440 tclcnf=`echo $tclinc | sed s/include/lib/g` | 7440 tclcnf=`echo $tclinc | sed s/include/lib/g` |
7441 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" | 7441 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" |
7442 else | 7442 else |
7443 tclcnf="/System/Library/Frameworks/Tcl.framework" | 7443 tclcnf=`echo $tclinc | sed s/include/lib/g` |
7444 tclcnf="$tclcnf /System/Library/Frameworks/Tcl.framework `xcrun --show-sdk-path`/System/Library/Frameworks/Tcl.framework" | |
7444 fi | 7445 fi |
7445 for try in $tclcnf; do | 7446 for try in $tclcnf; do |
7446 if test -f "$try/tclConfig.sh"; then | 7447 if test -f "$try/tclConfig.sh"; then |
7447 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 | 7448 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 |
7448 $as_echo "$try/tclConfig.sh" >&6; } | 7449 $as_echo "$try/tclConfig.sh" >&6; } |