Skip to content

Commit

Permalink
Update Tcl MacOS search paths
Browse files Browse the repository at this point in the history
  • Loading branch information
vanosg authored Aug 7, 2024
1 parent cd91671 commit c61ae0d
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions m4/tcl.m4
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [
# we reset no_tcl in case something fails here
no_tcl=true
AC_ARG_WITH(tcl,
AS_HELP_STRING([--with-tcl],[directory containing tcl configuration (tclConfig.sh)]),
with_tclconfig="${withval}")
AS_HELP_STRING([--with-tcl],
[directory containing tcl configuration (tclConfig.sh)]),
[with_tclconfig="${withval}"])
AC_MSG_CHECKING([for Tcl configuration])
AC_CACHE_VAL(ac_cv_c_tclconfig,[
Expand Down Expand Up @@ -151,7 +152,9 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [
for i in `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` \
`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Library/Frameworks/Tcl.framework 2>/dev/null` \
`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Network/Library/Frameworks/Tcl.framework 2>/dev/null` \
`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Tcl.framework 2>/dev/null` \
; do
if test -f "$i/Tcl.framework/tclConfig.sh" ; then
ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`"
Expand All @@ -178,14 +181,14 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [
for i in `ls -d ${libdir} 2>/dev/null` \
`ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib/tcl[[8-9]].[[0-9]] 2>/dev/null` \
`ls -d /usr/local/lib/tcl[[8-9]].[[0-9]] 2>/dev/null` \
`ls -d /usr/local/lib/tcl/tcl[[8-9]].[[0-9]] 2>/dev/null` \
`ls -d /usr/lib/tcl[[8-9]].[[0-9]] 2>/dev/null` \
`ls -d /usr/local/lib/tcl[[8-9]].[[0-9]] 2>/dev/null` \
`ls -d /usr/local/lib/tcl/tcl[[8-9]].[[0-9]] 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
ac_cv_c_tclconfig="`(cd $i; pwd)`"
Expand Down Expand Up @@ -224,7 +227,6 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [
fi
fi
])

##
## Here ends the standard Tcl configuration bits and starts the
## TEA specific functions
Expand Down

0 comments on commit c61ae0d

Please sign in to comment.