Mercurial > vim

changeset 13640:4ee47b5f2640 v8.0.1692

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1692: Python may not work when using statically linked library commit https://github.com/vim/vim/commit/3a21d9c7bb4d58cccd2152e319daa8f8ffa2e664 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 10 20:26:20 2018 +0200 patch 8.0.1692: Python may not work when using statically linked library Problem: Python may not work when using statically linked library . Solution: Do not define PYTHON_HOME and PYTHON3_HOME in configure if the Python library is linked statically.
author Christian Brabandt <cb@256bit.org>
date Tue, 10 Apr 2018 20:30:06 +0200
parents 1614a4749f81
children 976065406322
files src/auto/configure src/configure.ac src/version.c
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6062,7 +6062,7 @@ 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
+	if test "X$have_python_config_dir" = "X1" -a "$enable_pythoninterp" = "dynamic"; then
 	  	  PYTHON_CFLAGS="${PYTHON_CFLAGS} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
 
 	fi
@@ -6398,7 +6398,7 @@ 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
+	if test "X$have_python3_config_dir" = "X1" -a "$enable_python3interp" = "dynamic"; then
 	  	  PYTHON3_CFLAGS="${PYTHON3_CFLAGS}  -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
 	fi
         PYTHON3_SRC="if_python3.c"
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1255,7 +1255,7 @@ 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
+	if test "X$have_python_config_dir" = "X1" -a "$enable_pythoninterp" = "dynamic"; then
 	  dnl Define PYTHON_HOME if --with-python-config-dir was used
 	  PYTHON_CFLAGS="${PYTHON_CFLAGS} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
 
@@ -1469,7 +1469,7 @@ 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
+	if test "X$have_python3_config_dir" = "X1" -a "$enable_python3interp" = "dynamic"; 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
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1692,
+/**/
     1691,
 /**/
     1690,