Mercurial > vim
changeset 13628:b59806681b98 v8.0.1686
patch 8.0.1686: Python does not work when configuring with specific dir
commit https://github.com/vim/vim/commit/d088240b96bc8b2bdba9242dcb9e3d36f1e16c48
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 10 18:13:05 2018 +0200
patch 8.0.1686: Python does not work when configuring with specific dir
Problem: Python does not work when configuring with specific dir. (Rajdeep)
Solution: Do define PYTHON_HOME and PYTHON3_HOME in configure if the Python
config dir was specified.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 10 Apr 2018 18:15:07 +0200 |
| parents | ec331c768b68 |
| children | 21036fdd939d |
| files | src/auto/configure src/configure.ac src/version.c |
| diffstat | 3 files changed, 22 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5955,7 +5955,7 @@ fi # Check whether --with-python-config-dir was given. if test "${with_python_config_dir+set}" = set; then : - withval=$with_python_config_dir; vi_cv_path_python_conf="${withval}" + withval=$with_python_config_dir; vi_cv_path_python_conf="${withval}"; have_python_config_dir=1 fi @@ -6062,6 +6062,10 @@ fi 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}" fi + if test "X$have_python_config_dir" = "X1"; then + PYTHON_CFLAGS="${PYTHON_CFLAGS} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'" + + fi PYTHON_SRC="if_python.c" PYTHON_OBJ="objects/if_python.o" if test "${vi_cv_var_python_version}" = "1.4"; then @@ -6312,7 +6316,7 @@ fi # Check whether --with-python3-config-dir was given. if test "${with_python3_config_dir+set}" = set; then : - withval=$with_python3_config_dir; vi_cv_path_python3_conf="${withval}" + withval=$with_python3_config_dir; vi_cv_path_python3_conf="${withval}"; have_python3_config_dir=1 fi @@ -6394,6 +6398,9 @@ fi 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}" fi + if test "X$have_python3_config_dir" = "X1"; then + PYTHON3_CFLAGS="${PYTHON3_CFLAGS} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'" + fi PYTHON3_SRC="if_python3.c" PYTHON3_OBJ="objects/if_python3.o"
--- a/src/configure.ac +++ b/src/configure.ac @@ -1157,7 +1157,7 @@ if test "$enable_pythoninterp" = "yes" - AC_ARG_WITH(python-config-dir, [ --with-python-config-dir=PATH Python's config directory], - [ vi_cv_path_python_conf="${withval}" ] ) + [ vi_cv_path_python_conf="${withval}"; have_python_config_dir=1 ] ) AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf, [ @@ -1255,6 +1255,11 @@ eof 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}" fi + if test "X$have_python_config_dir" = "X1"; then + dnl Define PYTHON_HOME if --with-python-config-dir was used + PYTHON_CFLAGS="${PYTHON_CFLAGS} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'" + + fi PYTHON_SRC="if_python.c" PYTHON_OBJ="objects/if_python.o" if test "${vi_cv_var_python_version}" = "1.4"; then @@ -1399,7 +1404,7 @@ if test "$enable_python3interp" = "yes" AC_ARG_WITH(python3-config-dir, [ --with-python3-config-dir=PATH Python's config directory], - [ vi_cv_path_python3_conf="${withval}" ] ) + [ vi_cv_path_python3_conf="${withval}"; have_python3_config_dir=1 ] ) AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf, [ @@ -1464,6 +1469,10 @@ eof 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}" fi + if test "X$have_python3_config_dir" = "X1"; then + dnl Define PYTHON3_HOME if --with-python-config-dir was used + PYTHON3_CFLAGS="${PYTHON3_CFLAGS} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'" + fi PYTHON3_SRC="if_python3.c" PYTHON3_OBJ="objects/if_python3.o"