summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2022-01-19 15:38:58 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2022-01-19 15:38:58 -0500
commitf201da39edcd6ac1ab9a3edf3e20e2a73bbbe69e (patch)
tree3203bc7de96354bb93efb2bba051d47a96e20d66 /config
parenta7f4171071bbcdec79e8afa4cad1bc6951b098cc (diff)
downloadpostgresql-f201da39edcd6ac1ab9a3edf3e20e2a73bbbe69e.tar.gz
Make configure prefer python3 to plain python.
This avoids possibly selecting Python 2.x on systems that have both Python 2 and Python 3. We used to feel that what "python" links to is a user choice that we should honor. However, we're about to cease support for Python 2, so users will no longer have any choice of that sort. This small change is being made ahead of the big Python-2-ectomy so that we can see how much of the buildfarm is not yet prepared for that. Systems with only Python 2 will continue to build that way, for now. Discussion: https://postgr.es/m/2872c9a0-4b0a-1354-d5f6-94d6f85ba354@enterprisedb.com
Diffstat (limited to 'config')
-rw-r--r--config/python.m412
1 files changed, 5 insertions, 7 deletions
diff --git a/config/python.m4 b/config/python.m4
index d41aeb2876..bfcba30262 100644
--- a/config/python.m4
+++ b/config/python.m4
@@ -9,14 +9,12 @@
# 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.
+# Since we are transitioning to supporting only Python 3.x,
+# prefer python3 to plain python. If the latter exists at all,
+# it very possibly points to python2, which we don't want to
+# select unless it's the only choice.
AC_DEFUN([PGAC_PATH_PYTHON],
-[PGAC_PATH_PROGS(PYTHON, [python python3 python2])
+[PGAC_PATH_PROGS(PYTHON, [python3 python python2])
AC_ARG_VAR(PYTHON, [Python program])dnl
if test x"$PYTHON" = x""; then
AC_MSG_ERROR([Python not found])