diff options
| -rw-r--r-- | config/python.m4 | 49 | ||||
| -rwxr-xr-x | configure | 54 | ||||
| -rw-r--r-- | doc/src/sgml/installation.sgml | 6 |
3 files changed, 52 insertions, 57 deletions
diff --git a/config/python.m4 b/config/python.m4 index 0fa1e3e80d5..2fd1473b747 100644 --- a/config/python.m4 +++ b/config/python.m4 @@ -29,35 +29,32 @@ fi # as well as the Python version. AC_DEFUN([_PGAC_CHECK_PYTHON_DIRS], [AC_REQUIRE([PGAC_PATH_PYTHON]) -AC_MSG_CHECKING([for Python distutils module]) -if "${PYTHON}" -c 'import distutils' 2>&AS_MESSAGE_LOG_FD +python_fullversion=`${PYTHON} -c "import sys; print(sys.version)" | sed q` +AC_MSG_NOTICE([using python $python_fullversion]) +# python_fullversion is typically n.n.n plus some trailing junk +python_majorversion=`echo "$python_fullversion" | sed '[s/^\([0-9]*\).*/\1/]'` +python_minorversion=`echo "$python_fullversion" | sed '[s/^[0-9]*\.\([0-9]*\).*/\1/]'` +python_version=`echo "$python_fullversion" | sed '[s/^\([0-9]*\.[0-9]*\).*/\1/]'` +# Reject unsupported Python versions as soon as practical. +if test "$python_majorversion" -lt 3 -a "$python_minorversion" -lt 7; then + AC_MSG_ERROR([Python version $python_version is too old (version 2.7 or later is required)]) +fi + +AC_MSG_CHECKING([for Python sysconfig module]) +if "${PYTHON}" -c 'import sysconfig' 2>&AS_MESSAGE_LOG_FD then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) - AC_MSG_ERROR([distutils module not found]) + AC_MSG_ERROR([sysconfig module not found]) fi + AC_MSG_CHECKING([Python configuration directory]) -python_majorversion=`${PYTHON} -c "import sys; print(sys.version[[0]])"` -python_minorversion=`${PYTHON} -c "import sys; print(sys.version[[2]])"` -python_version=`${PYTHON} -c "import sys; print(sys.version[[:3]])"` -python_configdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"` +python_configdir=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('LIBPL'))))"` AC_MSG_RESULT([$python_configdir]) -# Reject unsupported Python versions as soon as practical. -if test "$python_majorversion" -lt 3 -a "$python_minorversion" -lt 4; then - AC_MSG_ERROR([Python version $python_version is too old (version 2.4 or later is required)]) -fi - -AC_MSG_CHECKING([Python include directories]) -python_includespec=`${PYTHON} -c " -import distutils.sysconfig -a = '-I' + distutils.sysconfig.get_python_inc(False) -b = '-I' + distutils.sysconfig.get_python_inc(True) -if a == b: - print(a) -else: - print(a + ' ' + b)"` +AC_MSG_CHECKING([Python include directory]) +python_includespec=`${PYTHON} -c "import sysconfig; print('-I' + sysconfig.get_config_var('INCLUDEPY'))"` if test "$PORTNAME" = win32 ; then python_includespec=`echo $python_includespec | sed 's,[[\]],/,g'` fi @@ -91,8 +88,8 @@ AC_DEFUN([PGAC_CHECK_PYTHON_EMBED_SETUP], [AC_REQUIRE([_PGAC_CHECK_PYTHON_DIRS]) AC_MSG_CHECKING([how to link an embedded Python application]) -python_libdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBDIR'))))"` -python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"` +python_libdir=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('LIBDIR'))))"` +python_ldlibrary=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('LDLIBRARY'))))"` # If LDLIBRARY exists and has a shlib extension, use it verbatim. ldlibrary=`echo "${python_ldlibrary}" | sed -e 's/\.so$//' -e 's/\.dll$//' -e 's/\.dylib$//' -e 's/\.sl$//'` @@ -104,11 +101,11 @@ else # Otherwise, guess the base name of the shlib. # LDVERSION was added in Python 3.2, before that use VERSION, # or failing that, $python_version from _PGAC_CHECK_PYTHON_DIRS. - python_ldversion=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"` + python_ldversion=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('LDVERSION'))))"` if test x"${python_ldversion}" != x""; then ldlibrary="python${python_ldversion}" else - python_version_var=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('VERSION'))))"` + python_version_var=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('VERSION'))))"` if test x"${python_version_var}" != x""; then ldlibrary="python${python_version_var}" else @@ -168,7 +165,7 @@ PL/Python.]) fi python_libspec="-L${python_libdir} -l${ldlibrary}" -python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"` +python_additional_libs=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"` AC_MSG_RESULT([${python_libspec} ${python_additional_libs}]) diff --git a/configure b/configure index d69681a0698..9ede53db41f 100755 --- a/configure +++ b/configure @@ -8230,41 +8230,39 @@ if test x"$PYTHON" = x""; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python distutils module" >&5 -$as_echo_n "checking for Python distutils module... " >&6; } -if "${PYTHON}" -c 'import distutils' 2>&5 +python_fullversion=`${PYTHON} -c "import sys; print(sys.version)" | sed q` +{ $as_echo "$as_me:${as_lineno-$LINENO}: using python $python_fullversion" >&5 +$as_echo "$as_me: using python $python_fullversion" >&6;} +# python_fullversion is typically n.n.n plus some trailing junk +python_majorversion=`echo "$python_fullversion" | sed 's/^\([0-9]*\).*/\1/'` +python_minorversion=`echo "$python_fullversion" | sed 's/^[0-9]*\.\([0-9]*\).*/\1/'` +python_version=`echo "$python_fullversion" | sed 's/^\([0-9]*\.[0-9]*\).*/\1/'` +# Reject unsupported Python versions as soon as practical. +if test "$python_majorversion" -lt 3 -a "$python_minorversion" -lt 7; then + as_fn_error $? "Python version $python_version is too old (version 2.7 or later is required)" "$LINENO" 5 +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python sysconfig module" >&5 +$as_echo_n "checking for Python sysconfig module... " >&6; } +if "${PYTHON}" -c 'import sysconfig' 2>&5 then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "distutils module not found" "$LINENO" 5 + as_fn_error $? "sysconfig module not found" "$LINENO" 5 fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python configuration directory" >&5 $as_echo_n "checking Python configuration directory... " >&6; } -python_majorversion=`${PYTHON} -c "import sys; print(sys.version[0])"` -python_minorversion=`${PYTHON} -c "import sys; print(sys.version[2])"` -python_version=`${PYTHON} -c "import sys; print(sys.version[:3])"` -python_configdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"` +python_configdir=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('LIBPL'))))"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $python_configdir" >&5 $as_echo "$python_configdir" >&6; } -# Reject unsupported Python versions as soon as practical. -if test "$python_majorversion" -lt 3 -a "$python_minorversion" -lt 4; then - as_fn_error $? "Python version $python_version is too old (version 2.4 or later is required)" "$LINENO" 5 -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Python include directories" >&5 -$as_echo_n "checking Python include directories... " >&6; } -python_includespec=`${PYTHON} -c " -import distutils.sysconfig -a = '-I' + distutils.sysconfig.get_python_inc(False) -b = '-I' + distutils.sysconfig.get_python_inc(True) -if a == b: - print(a) -else: - print(a + ' ' + b)"` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Python include directory" >&5 +$as_echo_n "checking Python include directory... " >&6; } +python_includespec=`${PYTHON} -c "import sysconfig; print('-I' + sysconfig.get_config_var('INCLUDEPY'))"` if test "$PORTNAME" = win32 ; then python_includespec=`echo $python_includespec | sed 's,[\],/,g'` fi @@ -8276,8 +8274,8 @@ $as_echo "$python_includespec" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link an embedded Python application" >&5 $as_echo_n "checking how to link an embedded Python application... " >&6; } -python_libdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBDIR'))))"` -python_ldlibrary=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDLIBRARY'))))"` +python_libdir=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('LIBDIR'))))"` +python_ldlibrary=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('LDLIBRARY'))))"` # If LDLIBRARY exists and has a shlib extension, use it verbatim. ldlibrary=`echo "${python_ldlibrary}" | sed -e 's/\.so$//' -e 's/\.dll$//' -e 's/\.dylib$//' -e 's/\.sl$//'` @@ -8289,11 +8287,11 @@ else # Otherwise, guess the base name of the shlib. # LDVERSION was added in Python 3.2, before that use VERSION, # or failing that, $python_version from _PGAC_CHECK_PYTHON_DIRS. - python_ldversion=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LDVERSION'))))"` + python_ldversion=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('LDVERSION'))))"` if test x"${python_ldversion}" != x""; then ldlibrary="python${python_ldversion}" else - python_version_var=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('VERSION'))))"` + python_version_var=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('VERSION'))))"` if test x"${python_version_var}" != x""; then ldlibrary="python${python_version_var}" else @@ -8353,7 +8351,7 @@ PL/Python." "$LINENO" 5 fi python_libspec="-L${python_libdir} -l${ldlibrary}" -python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"` +python_additional_libs=`${PYTHON} -c "import sysconfig; print(' '.join(filter(None,sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${python_libspec} ${python_additional_libs}" >&5 $as_echo "${python_libspec} ${python_additional_libs}" >&6; } diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index 6cfcffa6104..7cde895bd86 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -193,10 +193,10 @@ su - postgres To build the <application>PL/Python</> server programming language, you need a <productname>Python</productname> installation with the header files and - the <application>distutils</application> module. The minimum - required version is <productname>Python</productname> 2.4. + the <application>sysconfig</application> module. The minimum + required version is <productname>Python</productname> 2.7. <productname>Python 3</productname> is supported if it's - version 3.1 or later; but see + version 3.2 or later; but see <![%standalone-include[the <application>PL/Python</> documentation]]> <![%standalone-ignore[<xref linkend="plpython-python23">]]> when using Python 3. |