Updated Branches: refs/heads/master 6ad901c98 -> b37a4ab26
TS-2010: fix TCL framework search for Xcode 5 Xcode 5 moved all the frameworks into the Xcode bundle, so we have to use xcrun to find tclConfig.sh. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e8bdb2b6 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e8bdb2b6 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e8bdb2b6 Branch: refs/heads/master Commit: e8bdb2b68cdaf3653a33d2bd9e9ab7a7df80383e Parents: 6ad901c Author: James Peach <[email protected]> Authored: Tue Jul 9 10:01:11 2013 -0600 Committer: James Peach <[email protected]> Committed: Tue Jul 9 10:36:01 2013 -0600 ---------------------------------------------------------------------- build/tcl.m4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e8bdb2b6/build/tcl.m4 ---------------------------------------------------------------------- diff --git a/build/tcl.m4 b/build/tcl.m4 index 7ab726b..abe8044 100644 --- a/build/tcl.m4 +++ b/build/tcl.m4 @@ -74,12 +74,16 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ + for i in "`xcrun --show-sdk-path`/usr/lib" \ + `ls -d ~/Library/Frameworks 2>/dev/null` \ `ls -d /Library/Frameworks 2>/dev/null` \ `ls -d /Network/Library/Frameworks 2>/dev/null` \ `ls -d /System/Library/Frameworks 2>/dev/null` \ ; do - if test -f "$i/Tcl.framework/tclConfig.sh" ; then + if test -f "$i/tclConfig.sh" ; then + ac_cv_c_tclconfig="`(cd $i; pwd)`" + break + elif test -f "$i/Tcl.framework/tclConfig.sh" ; then ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`" break fi
