mirror of
https://github.com/postgres/postgres.git
synced 2025-06-10 09:21:54 +03:00
configure: Update python search order
Some systems don't ship with "python" by default anymore, only "python3" or "python2" or some combination, so include those in the configure search. Back-patch of commit7291733ac
. At the time that was only pushed back as far as v10, because of concerns about interactions with commitb21c569ce
. Closer analysis shows that if we just s/AC_PATH_PROG/AC_PATH_PROGS/, there is no effect on the older branches' behavior when PYTHON is explicitly specified, so it should be okay to back-patch: this will not break any configuration that worked before. And the need to support platforms with only a "python3" or "python2" executable is getting ever more urgent. Original patch by Peter Eisentraut, back-patch analysis by me Discussion: https://www.postgresql.org/message-id/flat/1457.1543184081%40sss.pgh.pa.us#c9cc1199338fd6a257589c6dcea6cf8d
This commit is contained in:
@ -6,10 +6,17 @@
|
|||||||
|
|
||||||
# PGAC_PATH_PYTHON
|
# PGAC_PATH_PYTHON
|
||||||
# ----------------
|
# ----------------
|
||||||
# Look for Python and set the output variable 'PYTHON'
|
# Look for Python and set the output variable 'PYTHON' if found,
|
||||||
# to 'python' if found, empty otherwise.
|
# 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],
|
AC_DEFUN([PGAC_PATH_PYTHON],
|
||||||
[AC_PATH_PROG(PYTHON, python)
|
[AC_PATH_PROGS(PYTHON, [python python3 python2])
|
||||||
if test x"$PYTHON" = x""; then
|
if test x"$PYTHON" = x""; then
|
||||||
AC_MSG_ERROR([Python not found])
|
AC_MSG_ERROR([Python not found])
|
||||||
fi
|
fi
|
||||||
|
9
configure
vendored
9
configure
vendored
@ -7683,8 +7683,10 @@ fi
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$with_python" = yes; then
|
if test "$with_python" = yes; then
|
||||||
# Extract the first word of "python", so it can be a program name with args.
|
for ac_prog in python python3 python2
|
||||||
set dummy python; ac_word=$2
|
do
|
||||||
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||||
|
set dummy $ac_prog; ac_word=$2
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||||
$as_echo_n "checking for $ac_word... " >&6; }
|
$as_echo_n "checking for $ac_word... " >&6; }
|
||||||
if ${ac_cv_path_PYTHON+:} false; then :
|
if ${ac_cv_path_PYTHON+:} false; then :
|
||||||
@ -7723,6 +7725,9 @@ $as_echo "no" >&6; }
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
test -n "$PYTHON" && break
|
||||||
|
done
|
||||||
|
|
||||||
if test x"$PYTHON" = x""; then
|
if test x"$PYTHON" = x""; then
|
||||||
as_fn_error $? "Python not found" "$LINENO" 5
|
as_fn_error $? "Python not found" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
@ -1441,7 +1441,8 @@ su - postgres
|
|||||||
<![%standalone-include[the <application>PL/Python</>
|
<![%standalone-include[the <application>PL/Python</>
|
||||||
documentation]]>
|
documentation]]>
|
||||||
<![%standalone-ignore[<xref linkend="plpython-python23">]]>
|
<![%standalone-ignore[<xref linkend="plpython-python23">]]>
|
||||||
for more information.
|
for more information. If this is not set, the following are probed
|
||||||
|
in this order: <literal>python python3 python2</literal>.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
Reference in New Issue
Block a user