blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tcl: fix tcl detection on some 64-bits systems (bug #32915)

Browse Source
This commit is contained in:
Sebastien Helleu 2011-03-26 17:59:01 +01:00
parent 8bfc387579
commit 6929486649
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,7 +1,7 @@
WeeChat ChangeLog WeeChat ChangeLog
================= =================
Sébastien Helleu <flashcode@flashtux.org> 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!) 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 * relay: do not send join for private buffers to client
* rmodifier: fix reload of file rmodifier.conf * rmodifier: fix reload of file rmodifier.conf
* rmodifier: fix crash when adding rmodifier with invalid regex * 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) * xfer: do not close chat buffers when removing xfer from list (bug #32271)
Version 0.3.4 (2011-01-16) Version 0.3.4 (2011-01-16)

4
cmake/FindTCL.cmake
View File

@ -72,10 +72,14 @@ STRING(REGEX REPLACE
SET(TCL_POSSIBLE_LIB_PATHS SET(TCL_POSSIBLE_LIB_PATHS
"${TCL_INCLUDE_PATH_PARENT}/lib" "${TCL_INCLUDE_PATH_PARENT}/lib"
"${TCL_INCLUDE_PATH_PARENT}/lib64"
"${TCL_LIBRARY_PATH}" "${TCL_LIBRARY_PATH}"
"${TCL_TCLSH_PATH_PARENT}/lib" "${TCL_TCLSH_PATH_PARENT}/lib"
"${TCL_TCLSH_PATH_PARENT}/lib64"
/usr/lib /usr/lib
/usr/lib64
/usr/local/lib /usr/local/lib
/usr/local/lib64
) )
IF(WIN32) IF(WIN32)

2
configure.in
View File

@ -716,7 +716,7 @@ if test "x$enable_tcl" = "xyes" ; then
AC_MSG_CHECKING(for tclConfig.sh) AC_MSG_CHECKING(for tclConfig.sh)
tcl_found="no" 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 if test "x$tclconfig" != "x" ; then
tcl_dirs="${tclconfig} ${tcl_dirs}" tcl_dirs="${tclconfig} ${tcl_dirs}"
fi fi