summaryrefslogtreecommitdiff
path: root/src/auto
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-04-10 18:13:05 +0200
committerBram Moolenaar <Bram@vim.org>2018-04-10 18:13:05 +0200
commitd088240b96bc8b2bdba9242dcb9e3d36f1e16c48 (patch)
tree65228ebe634314e7d03e3449276b913bf46873e9 /src/auto
parentf59c6e8cee092433d325ba21a107654a8d84f776 (diff)
downloadvim-git-d088240b96bc8b2bdba9242dcb9e3d36f1e16c48.tar.gz
patch 8.0.1686: Python does not work when configuring with specific dirv8.0.1686
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.
Diffstat (limited to 'src/auto')
-rwxr-xr-xsrc/auto/configure11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure
index f54947989..838129db8 100755
--- 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 @@ $as_echo "$vi_cv_dll_name_python" >&6; }
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 @@ $as_echo "$vi_cv_dll_name_python3" >&6; }
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"