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

8 files changed, 12 insertions, 16 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ea4979fb..e0cef4ffc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/configure.ac b/configure.ac
index af47dc5cb..29403298d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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([
diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc
index 712012806..9c8ebdf74 100644
--- a/doc/de/weechat_user.de.adoc
+++ b/doc/de/weechat_user.de.adoc
@@ -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>>.
diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc
index e7d1bfb8a..dffab25fa 100644
--- a/doc/en/weechat_user.en.adoc
+++ b/doc/en/weechat_user.en.adoc
@@ -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>>.
diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc
index ffa61eb23..a08cfcd41 100644
--- a/doc/fr/weechat_user.fr.adoc
+++ b/doc/fr/weechat_user.fr.adoc
@@ -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>>.
diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc
index 21a248189..abadcf718 100644
--- a/doc/it/weechat_user.it.adoc
+++ b/doc/it/weechat_user.it.adoc
@@ -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>>.
diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc
index 059f79c68..61cfbde89 100644
--- a/doc/ja/weechat_user.ja.adoc
+++ b/doc/ja/weechat_user.ja.adoc
@@ -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,リレープラグイン>>のコンパイル。
diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc
index 74acc5b56..9c6890015 100644
--- a/doc/pl/weechat_user.pl.adoc
+++ b/doc/pl/weechat_user.pl.adoc
@@ -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>>.