Skip to content

Commit d3b245c

Browse files
committed
updated for version 7.4a.011
Problem: Configure check for Python 3 config name isn't right. Solution: Always include vi_cv_var_python3_version. (Tim Harder)
1 parent 23b5afa commit d3b245c

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

src/auto/configure

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5674,10 +5674,7 @@ if test "${vi_cv_path_python3_conf+set}" = set; then :
56745674
else
56755675

56765676
vi_cv_path_python3_conf=
5677-
config_dir="config"
5678-
if test "${vi_cv_var_python3_abiflags}" != ""; then
5679-
config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
5680-
fi
5677+
config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
56815678
d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
56825679
if test -d "$d" && test -f "$d/config.c"; then
56835680
vi_cv_path_python3_conf="$d"

src/configure.in

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,10 +1110,7 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic";
11101110
AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf,
11111111
[
11121112
vi_cv_path_python3_conf=
1113-
config_dir="config"
1114-
if test "${vi_cv_var_python3_abiflags}" != ""; then
1115-
config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
1116-
fi
1113+
config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
11171114
d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
11181115
if test -d "$d" && test -f "$d/config.c"; then
11191116
vi_cv_path_python3_conf="$d"

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,8 @@ static char *(features[]) =
727727

728728
static int included_patches[] =
729729
{ /* Add new patch number below this line */
730+
/**/
731+
11,
730732
/**/
731733
10,
732734
/**/

0 commit comments

Comments
 (0)