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

Add support of python 2.7 in cmake and configure (debian #606989)

Browse Source
This commit is contained in:
Sebastien Helleu 2010-12-13 22:20:57 +01:00
parent 4a74325e61
commit 62dc84f4e9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,12 +1,13 @@
WeeChat ChangeLog WeeChat ChangeLog
================= =================
Sébastien Helleu <flashcode@flashtux.org> Sébastien Helleu <flashcode@flashtux.org>
v0.3.4-rc1, 2010-12-10 v0.3.4-rc1, 2010-12-13
Version 0.3.4 (under dev!) 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: add color support in option weechat.look.buffer_time_format
* core: call to hook_config when config option is created * core: call to hook_config when config option is created
* core: add new option weechat.look.highlight_regex and function * core: add new option weechat.look.highlight_regex and function

4
cmake/FindPython.cmake
View File

@ -34,7 +34,7 @@ IF(PYTHON_FOUND)
ENDIF(PYTHON_FOUND) ENDIF(PYTHON_FOUND)
FIND_PROGRAM(PYTHON_EXECUTABLE 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 PATHS /usr/bin /usr/local/bin /usr/pkg/bin
) )
@ -65,7 +65,7 @@ IF(PYTHON_EXECUTABLE)
) )
FIND_LIBRARY(PYTHON_LIBRARY 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} PATHS ${PYTHON_POSSIBLE_LIB_PATH}
) )

2
configure.in
View File

@ -477,7 +477,7 @@ fi
PYTHON_VERSION= PYTHON_VERSION=
if test "x$enable_python" = "xyes" ; then 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 if test -z $PYTHON ; then
AC_MSG_WARN([ AC_MSG_WARN([
*** Python must be installed on your system but python interpreter couldn't be found in path. *** Python must be installed on your system but python interpreter couldn't be found in path.