Patch 8.2.2970

[Bram Moolenaar]

Patch 8.2.2970
Problem: Python configure check uses deprecated command.
Solution: Use sysconfig instead of distutils if possible. (Zdenek Dohnal,
closes #8354)
Files: src/configure.ac, src/auto/configure


*** ../vim-8.2.2969/src/configure.ac 2021-05-21 11:43:54.774873171 +0200
--- src/configure.ac 2021-06-10 18:49:09.406924058 +0200
***************
*** 1487,1493 ****
[
vi_cv_path_python3_conf=
config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
! d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
if test -d "$d" && test -f "$d/config.c"; then
vi_cv_path_python3_conf="$d"
else
--- 1487,1496 ----
[
vi_cv_path_python3_conf=
config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
! d=`${vi_cv_path_python3} -c "import sysconfig; print(sysconfig.get_config_var('LIBPL'))" 2> /dev/null`
! if test "x$d" = "x"; then
! d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
! fi
if test -d "$d" && test -f "$d/config.c"; then
vi_cv_path_python3_conf="$d"
else
*** ../vim-8.2.2969/src/auto/configure 2021-05-21 11:43:54.778873150 +0200
--- src/auto/configure 2021-06-10 18:49:14.250913988 +0200
***************
*** 6755,6761 ****

vi_cv_path_python3_conf=
config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
! d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
if test -d "$d" && test -f "$d/config.c"; then
vi_cv_path_python3_conf="$d"
else
--- 6755,6764 ----

vi_cv_path_python3_conf=
config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
! d=`${vi_cv_path_python3} -c "import sysconfig; print(sysconfig.get_config_var('LIBPL'))" 2> /dev/null`
! if test "x$d" = "x"; then
! d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
! fi
if test -d "$d" && test -f "$d/config.c"; then
vi_cv_path_python3_conf="$d"
else
*** ../vim-8.2.2969/src/version.c 2021-06-10 18:43:21.743644898 +0200
--- src/version.c 2021-06-10 18:46:51.751209927 +0200
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2970,
/**/

--
ARTHUR: Old woman!
DENNIS: Man!
ARTHUR: Man. I'm sorry. Old man, What knight live in that castle over there?
DENNIS: I'm thirty-seven.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///