commit fee496d8825b1b5fc345234e18a750fa1cc1a1de
author Bram Moolenaar <Bram@vim.org> Fri Jul 12 20:07:24 2013 +0200
committer Bram Moolenaar <Bram@vim.org> Fri Jul 12 20:07:24 2013 +0200
tree b09606e18e9918c78eec49eca4ed6b75c4f7d87c
parent e741f2714db39a17f486102d992f856f56c7d54b

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)

src/auto/configure

diff --git a/src/auto/configure b/src/auto/configure
index 6975af1..f6bd053 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5674,10 +5674,7 @@
 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"

src/configure.in

diff --git a/src/configure.in b/src/configure.in
index 4358524..6501360 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1110,10 +1110,7 @@
       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"

src/version.c

diff --git a/src/version.c b/src/version.c
index 61694a4..676245d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    11,
+/**/
     10,
 /**/
     9,