diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-06-15 18:37:45 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-06-15 18:37:45 (GMT) |
commit | c9802b0230c526e8e09a018ea6099d572b34acd1 (patch) | |
tree | b49e5df40557699272ae8a1739713efb0f50e7bb /unix/tcl.m4 | |
parent | 15f804e04ee653eb4556a7e2265ab0c76200f483 (diff) | |
parent | df97278634191218b46b709ffea3a59cf573f7a4 (diff) | |
download | tcl-c9802b0230c526e8e09a018ea6099d572b34acd1.zip tcl-c9802b0230c526e8e09a018ea6099d572b34acd1.tar.gz tcl-c9802b0230c526e8e09a018ea6099d572b34acd1.tar.bz2 |
merge 8.6
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 cf6345f..cd64093 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)`" |