diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-07-12 20:07:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-07-12 20:07:24 +0200 |
| commit | fee496d8825b1b5fc345234e18a750fa1cc1a1de (patch) | |
| tree | b09606e18e9918c78eec49eca4ed6b75c4f7d87c | |
| parent | e741f2714db39a17f486102d992f856f56c7d54b (diff) | |
| download | vim-git-fee496d8825b1b5fc345234e18a750fa1cc1a1de.tar.gz | |
updated for version 7.4a.011v7.4a.011
Problem: Configure check for Python 3 config name isn't right.
Solution: Always include vi_cv_var_python3_version. (Tim Harder)
| -rwxr-xr-x | src/auto/configure | 5 | ||||
| -rw-r--r-- | src/configure.in | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/auto/configure b/src/auto/configure index 6975af174..f6bd0534b 100755 --- 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 4358524ee..65013602f 100644 --- 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 61694a467..676245d7b 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 11, +/**/ 10, /**/ 9, |