diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2010-11-09 21:53:59 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2010-11-09 21:53:59 +0100 |
| commit | 0b54d49306407d8b93c0a1789d162e17a2a32229 (patch) | |
| tree | af91f0dc885caced29961a49521b1f9be78c0473 | |
| parent | d4171e85e33da6393d8814d77ccd5cc268e8634f (diff) | |
| download | weechat-0b54d49306407d8b93c0a1789d162e17a2a32229.zip | |
Fix Tcl detection in autotools and cmake (look for tcl 8.5 or newer) (bug #30907)
| -rw-r--r-- | cmake/FindTCL.cmake | 28 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 5 insertions, 25 deletions
diff --git a/cmake/FindTCL.cmake b/cmake/FindTCL.cmake index a0c2297da..832b49067 100644 --- a/cmake/FindTCL.cmake +++ b/cmake/FindTCL.cmake @@ -87,10 +87,6 @@ IF(WIN32) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib" "$ENV{ProgramFiles}/Tcl/Lib" "C:/Program Files/Tcl/lib" "C:/Tcl/lib" @@ -99,14 +95,10 @@ ENDIF(WIN32) FIND_LIBRARY(TCL_LIBRARY NAMES - tcl - tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION} tcl86 tcl8.6 tcl85 tcl8.5 - tcl84 tcl8.4 - tcl83 tcl8.3 - tcl82 tcl8.2 - tcl80 tcl8.0 + tcl + tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION} PATHS ${TCL_POSSIBLE_LIB_PATHS} ) @@ -126,22 +118,14 @@ SET(TCL_POSSIBLE_INCLUDE_PATHS "${TCL_INCLUDE_PATH}" ${TCL_FRAMEWORK_INCLUDES} "${TCL_TCLSH_PATH_PARENT}/include" + /usr/include/tcl8.6 + /usr/include/tcl8.5 /usr/include /usr/local/include /usr/include/tcl${TCL_VERSION} - /usr/include/tcl8.6 - /usr/include/tcl8.5 - /usr/include/tcl8.4 - /usr/include/tcl8.3 - /usr/include/tcl8.2 - /usr/include/tcl8.0 /usr/local/include/tcl${TCL_VERSION} /usr/local/include/tcl8.6 /usr/local/include/tcl8.5 - /usr/local/include/tcl8.4 - /usr/local/include/tcl8.3 - /usr/local/include/tcl8.2 - /usr/local/include/tcl8.0 ) @@ -150,10 +134,6 @@ IF(WIN32) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/include" "$ENV{ProgramFiles}/Tcl/include" "C:/Program Files/Tcl/include" "C:/Tcl/include" diff --git a/configure.in b/configure.in index bde5a4255..c2bb0011a 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="/lib /usr/lib /usr/tcl/lib /usr/lib/tcl8.5 /usr/lib/tcl8.4 /usr/lib/tcl8.3 /usr/local/lib /usr/local/tcl-8.5/lib /usr/local/tcl-8.4/lib /usr/local/tcl-8.3/lib /usr/local/tcl/lib /opt/lib" + 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" if test "x$tclconfig" != "x" ; then tcl_dirs="${tclconfig} ${tcl_dirs}" fi |