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

core: fix help on python to build with Python 2 (issue #1382)

Browse Source
This commit is contained in:
Sébastien Helleu 2019-07-31 21:24:13 +02:00
parent 4744c3fa41
commit 8897e04c0d
8 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -102,7 +102,7 @@ option(ENABLE_SCRIPT "Enable Script plugin (script manager)" ON)
option(ENABLE_SCRIPTS "Enable script plugins (perl, python, ...)" ON)
option(ENABLE_PERL "Enable Perl scripting language" ON)
option(ENABLE_PYTHON "Enable Python scripting language" ON)
option(ENABLE_PYTHON2 "Use Python 2 first, fallback on Python 3" OFF)
option(ENABLE_PYTHON2 "Use Python 2 instead of Python 3" OFF)
option(ENABLE_RUBY "Enable Ruby scripting language" ON)
option(ENABLE_LUA "Enable Lua scripting language" ON)
option(ENABLE_TCL "Enable Tcl scripting language" ON)

6
configure.ac
View File

@ -154,7 +154,7 @@ AC_ARG_ENABLE(script, [ --disable-script turn off Script plugin (d
AC_ARG_ENABLE(scripts, [ --disable-scripts turn off script plugins (perl, python, ...) (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
AC_ARG_ENABLE(perl, [ --disable-perl turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes)
AC_ARG_ENABLE(python, [ --disable-python turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes)
AC_ARG_ENABLE(python2, [ --enable-python2 use Python 2 first, fallback on Python 3 (default=off)],enable_python2=$enableval,enable_python2=no)
AC_ARG_ENABLE(python2, [ --enable-python2 use Python 2 instead of Python 3 (default=off)],enable_python2=$enableval,enable_python2=no)
AC_ARG_ENABLE(ruby, [ --disable-ruby turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes)
AC_ARG_ENABLE(lua, [ --disable-lua turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
AC_ARG_ENABLE(tcl, [ --disable-tcl turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
@ -476,10 +476,10 @@ PYTHON_VERSION=
if test "x$enable_python" = "xyes" ; then
if test "x$enable_python2" = "xyes" ; then
PKG_CHECK_MODULES(PYTHON, [python2], [PYTHON_FOUND=yes], [PYTHON_FOUND=no])
AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python)
AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2)
else
PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes], [PYTHON_FOUND=no])
AC_PATH_PROGS(PYTHON, python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python)
AC_PATH_PROGS(PYTHON, python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3)
fi
if test -z $PYTHON && test "x$PYTHON_FOUND" != "xyes" ; then
AC_MSG_WARN([

4
doc/de/weechat_user.de.adoc
View File

@ -259,9 +259,9 @@ Liste von häufig verwendeten Optionen:
| ENABLE_PYTHON | `ON`, `OFF` | ON |
kompiliert <<scripts_plugins,Python Erweiterung>>.
// TRANSLATION MISSING
| ENABLE_PYTHON2 | `ON`, `OFF` | OFF |
kompiliert <<scripts_plugins,Python plugin>> zuerst mittles Python 2 , fällt dann
zurück auf Python 3, falls nicht vorhanden.
Compile <<scripts_plugins,Python plugin>> using Python 2 instead of Python 3.
| ENABLE_RELAY | `ON`, `OFF` | ON |
kompiliert <<relay_plugin,Relay Erweiterung>>.

3
doc/en/weechat_user.en.adoc
View File

@ -252,8 +252,7 @@ List of commonly used options:
Compile <<scripts_plugins,Python plugin>>.
| ENABLE_PYTHON2 | `ON`, `OFF` | OFF |
Compile <<scripts_plugins,Python plugin>> using Python 2 first, then fallback
on Python 3 if not found.
Compile <<scripts_plugins,Python plugin>> using Python 2 instead of Python 3.
| ENABLE_RELAY | `ON`, `OFF` | ON |
Compile <<relay_plugin,Relay plugin>>.

4
doc/fr/weechat_user.fr.adoc
View File

@ -256,8 +256,8 @@ Liste des options couramment utilisées :
Compiler <<scripts_plugins,l'extension Python>>.
| ENABLE_PYTHON2 | `ON`, `OFF` | OFF |
Compiler <<scripts_plugins,l'extension Python>> avec Python 2 en priorité,
et utiliser Python 3 s'il n'est pas trouvé.
Compiler <<scripts_plugins,l'extension Python>> avec Python 2 au lieu de
Python 3.
| ENABLE_RELAY | `ON`, `OFF` | ON |
Compiler <<relay_plugin,l'extension Relay>>.

3
doc/it/weechat_user.it.adoc
View File

@ -287,8 +287,7 @@ List of commonly used options:
// TRANSLATION MISSING
| ENABLE_PYTHON2 | `ON`, `OFF` | OFF |
Compile <<scripts_plugins,Python plugin>> using Python 2 first, then fallback
on Python 3 if not found.
Compile <<scripts_plugins,Python plugin>> using Python 2 instead of Python 3.
| ENABLE_RELAY | `ON`, `OFF` | ON |
Compile <<relay_plugin,Relay plugin>>.

3
doc/ja/weechat_user.ja.adoc
View File

@ -258,8 +258,7 @@ CMake に対するオプションを指定するには、以下の書式を使
// TRANSLATION MISSING
| ENABLE_PYTHON2 | `ON`, `OFF` | OFF |
Compile <<scripts_plugins,Python plugin>> using Python 2 first, then fallback
on Python 3 if not found.
Compile <<scripts_plugins,Python plugin>> using Python 2 instead of Python 3.
| ENABLE_RELAY | `ON`, `OFF` | ON |
<<relay_plugin,リレープラグイン>>のコンパイル。

3
doc/pl/weechat_user.pl.adoc
View File

@ -259,8 +259,7 @@ Lista popularnych opcji:
// TRANSLATION MISSING
| ENABLE_PYTHON2 | `ON`, `OFF` | OFF |
Compile <<scripts_plugins,Python plugin>> using Python 2 first, then fallback
on Python 3 if not found.
Compile <<scripts_plugins,Python plugin>> using Python 2 instead of Python 3.
| ENABLE_RELAY | `ON`, `OFF` | ON |
Kompilacja <<relay_plugin,wtyczki relay>>.