mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-18 18:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure: Update python search order

Browse Source 
Some systems don't ship with "python" by default anymore, only
"python3" or "python2" or some combination, so include those in the
configure search.

Discussion: https://www.postgresql.org/message-id/flat/1457.1543184081%40sss.pgh.pa.us#c9cc1199338fd6a257589c6dcea6cf8d
This commit is contained in:
Peter Eisentraut 2019-01-11 15:45:15 +01:00
parent 0acb3bc33a
commit 7291733ac9
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/python.m4
View File

@ -8,8 +8,15 @@
# ----------------
# Look for Python and set the output variable 'PYTHON' if found,
# fail otherwise.
#
# As the Python 3 transition happens and PEP 394 isn't updated, we
# need to cater to systems that don't have unversioned "python" by
# default. Some systems ship with "python3" by default and perhaps
# have "python" in an optional package. Some systems only have
# "python2" and "python3", in which case it's reasonable to prefer the
# newer version.
AC_DEFUN([PGAC_PATH_PYTHON],
[PGAC_PATH_PROGS(PYTHON, python)
[PGAC_PATH_PROGS(PYTHON, [python python3 python2])
if test x"$PYTHON" = x""; then
AC_MSG_ERROR([Python not found])
fi

2
configure vendored
View File

@ -9699,7 +9699,7 @@ fi
if test "$with_python" = yes; then
if test -z "$PYTHON"; then
for ac_prog in python
for ac_prog in python python3 python2
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2

3
doc/src/sgml/installation.sgml
View File

@ -1501,7 +1501,8 @@ su - postgres
implicitly chosen) determines which variant of the PL/Python
language becomes available. See
<xref linkend="plpython-python23"/>
for more information. The default is <command>python</command>.
for more information. If this is not set, the following are probed
in this order: <literal>python python3 python2</literal>.
</para>
</listitem>
</varlistentry>