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

python: fix detection of python (first try "python2.x" and then "python") (bug #36835)

Browse Source
This commit is contained in:
Sebastien Helleu 2012-07-17 14:07:03 +02:00
parent 7caa481b24
commit 24a06f0e08
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
v0.3.9-dev, 2012-07-15
v0.3.9-dev, 2012-07-17
Version 0.3.9 (under dev!)
@ -46,6 +46,8 @@ Version 0.3.9 (under dev!)
* irc: reallow names beginning with "#" for servers
* lua: support of lua 5.2
* lua: fix crash when unloading a script without pointer to interpreter
* python: fix detection of python (first try "python2.x" and then "python")
(bug #36835)
* python: fix crash when unloading a script without pointer to interpreter
* relay: fix freeze when writing on relay socket (use non-blocking sockets in
relay for irc and weechat protocols) (bug #36655)

4
cmake/FindPython.cmake
View File

@ -34,7 +34,7 @@ IF(PYTHON_FOUND)
ENDIF(PYTHON_FOUND)
FIND_PROGRAM(PYTHON_EXECUTABLE
NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python
PATHS /usr/bin /usr/local/bin /usr/pkg/bin
)
@ -65,7 +65,7 @@ IF(PYTHON_EXECUTABLE)
)
FIND_LIBRARY(PYTHON_LIBRARY
NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python
PATHS ${PYTHON_POSSIBLE_LIB_PATH}
)

2
configure.in
View File

@ -459,7 +459,7 @@ fi
PYTHON_VERSION=
if test "x$enable_python" = "xyes" ; then
AC_PATH_PROGS(PYTHON, python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2)
AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python)
if test -z $PYTHON ; then
AC_MSG_WARN([
*** Python must be installed on your system but python interpreter couldn't be found in path.