Commit512fc2d

committed

Revert "Make configure prefer python3 to plain python."

This reverts commitf201da3.The buildfarm is not ready for python3, evidently, so we'llgive the owners some more time to get set up.Discussion:https://postgr.es/m/2872c9a0-4b0a-1354-d5f6-94d6f85ba354@enterprisedb.com

1 parent4fdbf9a commit512fc2dCopy full SHA for 512fc2d

File tree

-7

lines changed

-7

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,14 @@`
`9`	`9`	`# Look for Python and set the output variable 'PYTHON' if found,`
`10`	`10`	`# fail otherwise.`
`11`	`11`	`#`
`12`		`-# Since we are transitioning to supporting only Python 3.x,`
`13`		`-# prefer python3 to plain python. If the latter exists at all,`
`14`		`-# it very possibly points to python2, which we don't want to`
`15`		`-# select unless it's the only choice.`
	`12`	`+# As the Python 3 transition happens and PEP 394 isn't updated, we`
	`13`	`+# need to cater to systems that don't have unversioned "python" by`
	`14`	`+# default. Some systems ship with "python3" by default and perhaps`
	`15`	`+# have "python" in an optional package. Some systems only have`
	`16`	`+# "python2" and "python3", in which case it's reasonable to prefer the`
	`17`	`+# newer version.`
`16`	`18`	`AC_DEFUN([PGAC_PATH_PYTHON],`
`17`		`-[PGAC_PATH_PROGS(PYTHON,[python3python python2])`
	`19`	`+[PGAC_PATH_PROGS(PYTHON,[python python3 python2])`
`18`	`20`	`AC_ARG_VAR(PYTHON,[Python program])dnl`
`19`	`21`	`if test x"$PYTHON" = x""; then`
`20`	`22`	`AC_MSG_ERROR([Python not found])`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10279,7 +10279,7 @@ fi`
`10279`	`10279`
`10280`	`10280`	`if test "$with_python" = yes; then`
`10281`	`10281`	`if test -z "$PYTHON"; then`
`10282`		`- for ac_prog inpython3python python2`
	`10282`	`+ for ac_prog in python python3 python2`
`10283`	`10283`	`do`
`10284`	`10284`	`# Extract the first word of "$ac_prog", so it can be a program name with args.`
`10285`	`10285`	`set dummy $ac_prog; ac_word=$2`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1875,7 +1875,7 @@ build-postgresql:`
`1875`	`1875`	`language becomes available. See`
`1876`	`1876`	`<xref linkend="plpython-python23"/>`
`1877`	`1877`	`for more information. If this is not set, the following are probed`
`1878`		`- in this order: <literal>python3python python2</literal>.`
	`1878`	`+ in this order: <literal>python python3 python2</literal>.`
`1879`	`1879`	`</para>`
`1880`	`1880`	`</listitem>`
`1881`	`1881`	`</varlistentry>`

Comments

(0)