macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

change SC_PATH_TCLCONFIG and SC_PUBLIC_TCL_HEADERS to look in /usr before /usr/local, and reflect the fact that we can use Tcl 8.5 but not 8.3

Browse Source 
git-svn-id: https://svn.macports.org/repository/macports/trunk/base@62340 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Joshua Root
2010-01-04 23:11:07 +00:00
parent a03f69c539
commit 38b7d30d60
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+4 -5
View File
@@ -8614,15 +8614,14 @@ else
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
for i in `ls -d ${libdir} 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /System/Library/Tcl/8.3 2>/dev/null` \
`ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
`ls -d /usr/local/lib/tcl8.4 2>/dev/null` \
`ls -d /usr/local/lib/tcl8.3 2>/dev/null` \
`ls -d /usr/lib/tcl8.5 2>/dev/null` \
`ls -d /usr/lib/tcl8.4 2>/dev/null` \
`ls -d /usr/lib/tcl8.3 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
ac_cv_c_tclconfig=`(cd $i; pwd)`
@@ -8745,7 +8744,7 @@ else
# check some other possible local system locations.
for i in \
/usr/local/include /usr/include /usr/local/include/tcl${TCL_VERSION} /usr/include/tcl${TCL_VERSION}; do
/usr/include /usr/local/include /usr/local/include/tcl${TCL_VERSION} /usr/include/tcl${TCL_VERSION}; do
if test -f "$i/tcl.h" ; then
ac_cv_c_tclh=$i
break
m4/tcl.m4
+4 -5
View File
@@ -106,15 +106,14 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
for i in `ls -d ${libdir} 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /System/Library/Tcl/8.3 2>/dev/null` \
`ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
`ls -d /usr/local/lib/tcl8.4 2>/dev/null` \
`ls -d /usr/local/lib/tcl8.3 2>/dev/null` \
`ls -d /usr/lib/tcl8.5 2>/dev/null` \
`ls -d /usr/lib/tcl8.4 2>/dev/null` \
`ls -d /usr/lib/tcl8.3 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
ac_cv_c_tclconfig=`(cd $i; pwd)`
@@ -2545,7 +2544,7 @@ AC_DEFUN(SC_PUBLIC_TCL_HEADERS, [
# check some other possible local system locations.
for i in \
/usr/local/include /usr/include /usr/local/include/tcl${TCL_VERSION} /usr/include/tcl${TCL_VERSION}; do
/usr/include /usr/local/include /usr/local/include/tcl${TCL_VERSION} /usr/include/tcl${TCL_VERSION}; do
if test -f "$i/tcl.h" ; then
ac_cv_c_tclh=$i
break