diff options
| author | hypnotoad <yoda@etoyoc.com> | 2018-08-14 08:46:22 (GMT) |
|---|---|---|
| committer | hypnotoad <yoda@etoyoc.com> | 2018-08-14 08:46:22 (GMT) |
| commit | 9b285dde85a6b7f41dd63cadb8c32517e3b1d1dd (patch) | |
| tree | d6ffa0f2db12aa93aad7514167cf818ce0695597 /unix/tcl.m4 | |
| parent | d62033b7e21f33603528c9712d11732f1fc756f7 (diff) | |
| parent | e5270637c01b6fbb0f016048fc9d9735f980421a (diff) | |
| download | tcl-9b285dde85a6b7f41dd63cadb8c32517e3b1d1dd.zip tcl-9b285dde85a6b7f41dd63cadb8c32517e3b1d1dd.tar.gz tcl-9b285dde85a6b7f41dd63cadb8c32517e3b1d1dd.tar.bz2 | |
Merging changes with 8.7
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index d705480..4754c84 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -91,11 +91,13 @@ AC_DEFUN([SC_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/local/lib/tcl8.7 2>/dev/null` \ + `ls -d /usr/local/lib/tcl/tcl8.7 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then ac_cv_c_tclconfig="`(cd $i; pwd)`" @@ -224,8 +226,11 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ `ls -d ${prefix}/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/local/lib/tk8.7 2>/dev/null` \ + `ls -d /usr/local/lib/tcl/tk8.7 2>/dev/null` \ ; do if test -f "$i/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i; pwd)`" |