diff --git a/ChangeLog b/ChangeLog index 9992d6b56..14eea143d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,13 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.3.4-rc1, 2010-12-10 +v0.3.4-rc1, 2010-12-13 Version 0.3.4 (under dev!) -------------------------- +* core: add support of python 2.7 in cmake and configure (debian #606989) * core: add color support in option weechat.look.buffer_time_format * core: call to hook_config when config option is created * core: add new option weechat.look.highlight_regex and function diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake index b36785f17..85e1df5e3 100644 --- a/cmake/FindPython.cmake +++ b/cmake/FindPython.cmake @@ -34,7 +34,7 @@ IF(PYTHON_FOUND) ENDIF(PYTHON_FOUND) FIND_PROGRAM(PYTHON_EXECUTABLE - NAMES python python2.6 python2.5 python2.4 python2.3 python2.2 + NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 PATHS /usr/bin /usr/local/bin /usr/pkg/bin ) @@ -65,7 +65,7 @@ IF(PYTHON_EXECUTABLE) ) FIND_LIBRARY(PYTHON_LIBRARY - NAMES python python2.6 python2.5 python2.4 python2.3 python2.2 + NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 PATHS ${PYTHON_POSSIBLE_LIB_PATH} ) diff --git a/configure.in b/configure.in index 96dfdb359..1c7351ee4 100644 --- a/configure.in +++ b/configure.in @@ -477,7 +477,7 @@ fi PYTHON_VERSION= if test "x$enable_python" = "xyes" ; then - AC_PATH_PROGS(PYTHON, python python2.5 python2.4 python2.3 python2.2) + AC_PATH_PROGS(PYTHON, python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2) if test -z $PYTHON ; then AC_MSG_WARN([ *** Python must be installed on your system but python interpreter couldn't be found in path.