diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-06-15 18:35:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-06-15 18:35:56 (GMT) |
| commit | df97278634191218b46b709ffea3a59cf573f7a4 (patch) | |
| tree | 35d2505e393579b9189a22e0351dfc87dad7b754 | |
| parent | e393000b1d76079c2b9245ef0f280266e7f7d747 (diff) | |
| parent | 06fc5fb636829f99e0f6e8c20bc1cd07338a5515 (diff) | |
| download | tcl-df97278634191218b46b709ffea3a59cf573f7a4.zip tcl-df97278634191218b46b709ffea3a59cf573f7a4.tar.gz tcl-df97278634191218b46b709ffea3a59cf573f7a4.tar.bz2 | |
merge 8.5
| -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 d583880..0ee12f9 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.6 2>/dev/null` \ + `ls -d /usr/local/lib/tcl/tcl8.6 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.6 2>/dev/null` \ + `ls -d /usr/local/lib/tcl/tk8.6 2>/dev/null` \ ; do if test -f "$i/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i; pwd)`" |