Revert "Make configure prefer python3 to plain python."
This reverts commit f201da39ed
.
The buildfarm is not ready for python3, evidently, so we'll
give the owners some more time to get set up.
Discussion: https://postgr.es/m/2872c9a0-4b0a-1354-d5f6-94d6f85ba354@enterprisedb.com
This commit is contained in:
parent
4fdbf9af51
commit
512fc2dd79
|
@ -9,12 +9,14 @@
|
||||||
# Look for Python and set the output variable 'PYTHON' if found,
|
# Look for Python and set the output variable 'PYTHON' if found,
|
||||||
# fail otherwise.
|
# fail otherwise.
|
||||||
#
|
#
|
||||||
# Since we are transitioning to supporting only Python 3.x,
|
# As the Python 3 transition happens and PEP 394 isn't updated, we
|
||||||
# prefer python3 to plain python. If the latter exists at all,
|
# need to cater to systems that don't have unversioned "python" by
|
||||||
# it very possibly points to python2, which we don't want to
|
# default. Some systems ship with "python3" by default and perhaps
|
||||||
# select unless it's the only choice.
|
# 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],
|
||||||
[PGAC_PATH_PROGS(PYTHON, [python3 python python2])
|
[PGAC_PATH_PROGS(PYTHON, [python python3 python2])
|
||||||
AC_ARG_VAR(PYTHON, [Python program])dnl
|
AC_ARG_VAR(PYTHON, [Python program])dnl
|
||||||
if test x"$PYTHON" = x""; then
|
if test x"$PYTHON" = x""; then
|
||||||
AC_MSG_ERROR([Python not found])
|
AC_MSG_ERROR([Python not found])
|
||||||
|
|
|
@ -10279,7 +10279,7 @@ fi
|
||||||
|
|
||||||
if test "$with_python" = yes; then
|
if test "$with_python" = yes; then
|
||||||
if test -z "$PYTHON"; then
|
if test -z "$PYTHON"; then
|
||||||
for ac_prog in python3 python python2
|
for ac_prog in python python3 python2
|
||||||
do
|
do
|
||||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||||
set dummy $ac_prog; ac_word=$2
|
set dummy $ac_prog; ac_word=$2
|
||||||
|
|
|
@ -1875,7 +1875,7 @@ build-postgresql:
|
||||||
language becomes available. See
|
language becomes available. See
|
||||||
<xref linkend="plpython-python23"/>
|
<xref linkend="plpython-python23"/>
|
||||||
for more information. If this is not set, the following are probed
|
for more information. If this is not set, the following are probed
|
||||||
in this order: <literal>python3 python python2</literal>.
|
in this order: <literal>python python3 python2</literal>.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
Loading…
Reference in New Issue