]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
configure: Update python search order
authorPeter Eisentraut <peter@eisentraut.org>
Fri, 11 Jan 2019 14:45:15 +0000 (15:45 +0100)
committerPeter Eisentraut <peter@eisentraut.org>
Sun, 13 Jan 2019 09:25:23 +0000 (10:25 +0100)
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

config/python.m4
configure
doc/src/sgml/installation.sgml

index f3c764222968dc84fe7427a765e165643556cbf5..0fa1e3e80d5214234c56921c9a46ae84ee293896 100644 (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
index dca2d2dbf131e582a031021292011d1bad944e77..c1f67c445e4172ab4fcd689f7681a339e06f792d 100755 (executable)
--- a/configure
+++ b/configure
@@ -8031,7 +8031,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
index c5acb1dbfb46f237a626dc89a6d2c8054371021b..57031c400ba636e8d8923b818841b73f06593929 100644 (file)
@@ -1473,7 +1473,8 @@ su - postgres
          <![%standalone-include[the <application>PL/Python</>
          documentation]]>
          <![%standalone-ignore[<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>