# HG changeset patch # User Bram Moolenaar # Date 1373652444 -7200 # Node ID ce587b26b8d6bec140af41712bb99c4c73c3bf99 # Parent 5bb04d03dfa843c1080ed3872daacc42caa86542 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 --- a/src/auto/configure +++ b/src/auto/configure @@ -5674,10 +5674,7 @@ if test "${vi_cv_path_python3_conf+set}" 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 --- a/src/configure.in +++ b/src/configure.in @@ -1110,10 +1110,7 @@ if test "$enable_python3interp" = "yes" 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 --- 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,