diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | cmake/FindTCL.cmake | 4 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.3.5-dev, 2011-03-23 +v0.3.5-dev, 2011-03-26 Version 0.3.5 (under dev!) @@ -61,6 +61,7 @@ Version 0.3.5 (under dev!) * relay: do not send join for private buffers to client * rmodifier: fix reload of file rmodifier.conf * rmodifier: fix crash when adding rmodifier with invalid regex +* tcl: fix tcl detection on some 64-bits systems (bug #32915) * xfer: do not close chat buffers when removing xfer from list (bug #32271) Version 0.3.4 (2011-01-16) diff --git a/cmake/FindTCL.cmake b/cmake/FindTCL.cmake index ee16bf705..9ac5565ab 100644 --- a/cmake/FindTCL.cmake +++ b/cmake/FindTCL.cmake @@ -72,10 +72,14 @@ STRING(REGEX REPLACE SET(TCL_POSSIBLE_LIB_PATHS "${TCL_INCLUDE_PATH_PARENT}/lib" + "${TCL_INCLUDE_PATH_PARENT}/lib64" "${TCL_LIBRARY_PATH}" "${TCL_TCLSH_PATH_PARENT}/lib" + "${TCL_TCLSH_PATH_PARENT}/lib64" /usr/lib + /usr/lib64 /usr/local/lib + /usr/local/lib64 ) IF(WIN32) diff --git a/configure.in b/configure.in index 665be93e6..0692d9f3f 100644 --- a/configure.in +++ b/configure.in @@ -716,7 +716,7 @@ if test "x$enable_tcl" = "xyes" ; then AC_MSG_CHECKING(for tclConfig.sh) tcl_found="no" - tcl_dirs="/usr/lib/tcl8.5 /lib /usr/lib /usr/tcl/lib /usr/local/tcl-8.5/lib /usr/local/lib /usr/local/tcl/lib /opt/lib" + tcl_dirs="/usr/lib/tcl8.5 /usr/lib64/tcl8.5 /lib /lib64 /usr/lib /usr/lib64 /usr/tcl/lib /usr/tcl/lib64 /usr/local/tcl-8.5/lib /usr/local/tcl-8.5/lib64 /usr/local/lib /usr/local/lib64 /usr/local/tcl/lib /usr/local/tcl/lib64 /opt/lib /opt/lib64" if test "x$tclconfig" != "x" ; then tcl_dirs="${tclconfig} ${tcl_dirs}" fi |