Fix to find tclConfig.sh on more recent versions of macOS

This commit is contained in:
William S Fulton 2018-08-06 07:53:38 +01:00
commit 82517489ee

View file

@ -480,16 +480,23 @@ if test x"${with_tclconfig}" != x ; then
fi fi
fi fi
# check in a few common install locations # check in a few common install locations
dirs="/usr/lib*/ /usr/lib*/tcl*/ /usr/local/lib*/ /usr/local/lib*/tcl*/"
case $host in
*-*-darwin*)
dirs="/System/Library/Frameworks/Tcl.framework/ $dirs"
;;
*)
;;
esac
if test x"${TCLCONFIG}" = x ; then if test x"${TCLCONFIG}" = x ; then
for i in `ls -d -r /usr/lib*/ 2>/dev/null` \ for d in $dirs ; do
`ls -d -r /usr/lib*/tcl*/ 2>/dev/null` \ for i in `ls -d -r $d 2>/dev/null` ; do
`ls -d -r /usr/local/lib*/ 2>/dev/null` \ if test -f $i"tclConfig.sh" ; then
`ls -d -r /usr/local/lib*/tcl*/ 2>/dev/null` ; do TCLCONFIG=`(cd $i; pwd)`
if test -f $i"tclConfig.sh" ; then break
TCLCONFIG=`(cd $i; pwd)` fi
break
fi
done done
done
fi fi
if test x"${TCLCONFIG}" = x ; then if test x"${TCLCONFIG}" = x ; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)