aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.4a.011

Browse Source 
Problem:    Configure check for Python 3 config name isn't right.
Solution:   Always include vi_cv_var_python3_version. (Tim Harder)
This commit is contained in:
Bram Moolenaar 2013-07-12 20:07:24 +02:00
parent e741f2714d
commit fee496d882
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/auto/configure vendored
View File

@ -5674,10 +5674,7 @@ if test "${vi_cv_path_python3_conf+set}" = set; then :
else else
vi_cv_path_python3_conf= vi_cv_path_python3_conf=
config_dir="config" config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
if test "${vi_cv_var_python3_abiflags}" != ""; then
config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
fi
d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` 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 if test -d "$d" && test -f "$d/config.c"; then
vi_cv_path_python3_conf="$d" vi_cv_path_python3_conf="$d"

5
src/configure.in
View File

@ -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, AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf,
[ [
vi_cv_path_python3_conf= vi_cv_path_python3_conf=
config_dir="config" config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
if test "${vi_cv_var_python3_abiflags}" != ""; then
config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
fi
d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` 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 if test -d "$d" && test -f "$d/config.c"; then
vi_cv_path_python3_conf="$d" vi_cv_path_python3_conf="$d"

2
src/version.c
View File

@ -727,6 +727,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
11,
/**/ /**/
10, 10,
/**/ /**/