mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +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. Discussion: https://www.postgresql.org/message-id/flat/1457.1543184081%40sss.pgh.pa.us#c9cc1199338fd6a257589c6dcea6cf8d
This commit is contained in:
		@@ -8,8 +8,15 @@
 | 
				
			|||||||
# ----------------
 | 
					# ----------------
 | 
				
			||||||
# 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.
 | 
				
			||||||
 | 
					#
 | 
				
			||||||
 | 
					# 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],
 | 
				
			||||||
[PGAC_PATH_PROGS(PYTHON, python)
 | 
					[PGAC_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
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								configure
									
									
									
									
										vendored
									
									
								
							@@ -8031,7 +8031,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 python
 | 
					  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
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1473,7 +1473,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.  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>
 | 
					        </para>
 | 
				
			||||||
       </listitem>
 | 
					       </listitem>
 | 
				
			||||||
      </varlistentry>
 | 
					      </varlistentry>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user