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)

diff --git a/src/auto/configure b/src/auto/configure
index 6975af174c630d554bc2ddeff7153bf7cb5c58d2..f6bd0534bebf3f2aa3a56af627e58334062353b5 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5674,10 +5674,7 @@ if test "${vi_cv_path_python3_conf+set}" = set; then :
 else
 
        vi_cv_path_python3_conf=
-       config_dir="config"
-       if test "${vi_cv_var_python3_abiflags}" != ""; then
-         config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
-       fi
+       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"

diff --git a/src/configure.in b/src/configure.in
index 4358524eecee0ffdd0bd3299e280129ef6d55828..65013602f373fcbbf6d25cb2b230041f6cb4549f 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1110,10 +1110,7 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic";
       AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf,
       [
        vi_cv_path_python3_conf=
-       config_dir="config"
-       if test "${vi_cv_var_python3_abiflags}" != ""; then
-         config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
-       fi
+       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"

diff --git a/src/version.c b/src/version.c
index 61694a4672d2e7c3e27fc8eae17c8134c8802011..676245d7b1c51c4b30bc5dc899cc4df3fcc62be7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    11,
 /**/
     10,
 /**/