Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
patch 8.0.1683: Python upgrade breaks Vim when defining PYTHON_HOME
Problem: Python upgrade breaks Vim when defining PYTHON_HOME.
Solution: Do not define PYTHON_HOME and PYTHON3_HOME in configure. (Naoki
Inada, closes #2787 )
Loading branch information
Showing
3 changed files
with
10 additions
and
8 deletions .
+4
−4
src/auto/configure
+4
−4
src/configure.ac
+2
−0
src/version.c
@@ -6058,9 +6058,9 @@ $as_echo "$vi_cv_dll_name_python" >&6; }
PYTHON_LIBS=" ${vi_cv_path_python_plibs} "
if test " ${vi_cv_path_python_pfx} " = " ${vi_cv_path_python_epfx} " ; then
PYTHON_CFLAGS=" -I${vi_cv_path_python_pfx} /include/python${vi_cv_var_python_version} -DPYTHON_HOME=' \" ${vi_cv_path_python_pfx} \" ' "
PYTHON_CFLAGS=" -I${vi_cv_path_python_pfx} /include/python${vi_cv_var_python_version} "
else
PYTHON_CFLAGS=" -I${vi_cv_path_python_pfx} /include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx} /include/python${vi_cv_var_python_version} -DPYTHON_HOME=' \" ${vi_cv_path_python_pfx} \" ' "
PYTHON_CFLAGS=" -I${vi_cv_path_python_pfx} /include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx} /include/python${vi_cv_var_python_version} "
fi
PYTHON_SRC=" if_python.c"
PYTHON_OBJ=" objects/if_python.o"
@@ -6390,9 +6390,9 @@ $as_echo "$vi_cv_dll_name_python3" >&6; }
PYTHON3_LIBS=" ${vi_cv_path_python3_plibs} "
if test " ${vi_cv_path_python3_pfx} " = " ${vi_cv_path_python3_epfx} " ; then
PYTHON3_CFLAGS=" -I${vi_cv_path_python3_pfx} /include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L \" ${vi_cv_path_python3_pfx} \" ' "
PYTHON3_CFLAGS=" -I${vi_cv_path_python3_pfx} /include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} "
else
PYTHON3_CFLAGS=" -I${vi_cv_path_python3_pfx} /include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx} /include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L \" ${vi_cv_path_python3_pfx} \" ' "
PYTHON3_CFLAGS=" -I${vi_cv_path_python3_pfx} /include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx} /include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} "
fi
PYTHON3_SRC=" if_python3.c"
PYTHON3_OBJ=" objects/if_python3.o"
@@ -1251,9 +1251,9 @@ eof
PYTHON_LIBS="${vi_cv_path_python_plibs}"
if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"' "
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}"
else
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"' "
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
fi
PYTHON_SRC="if_python.c"
PYTHON_OBJ="objects/if_python.o"
@@ -1460,9 +1460,9 @@ eof
PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"' "
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
else
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"' "
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
fi
PYTHON3_SRC="if_python3.c"
PYTHON3_OBJ="objects/if_python3.o"
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/* */
1683 ,
/* */
1682 ,
/* */
Toggle all file notes
Toggle all file annotations