Mercurial > vim

comparison src/configure.ac @ 13622:825841608429 v8.0.1683

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1683: Python upgrade breaks Vim when defining PYTHON_HOME commit https://github.com/vim/vim/commit/0424958bde3d3e74c721ba39ab4d5a4744897393 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 10 13:29:34 2018 +0200 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)
author Christian Brabandt <cb@256bit.org>
date Tue, 10 Apr 2018 13:30:08 +0200
parents eb45750114ed
children b59806681b98
comparison
equal deleted inserted replaced
13621:5e77568222bd 13622:825841608429
1249 fi 1249 fi
1250 ]) 1250 ])
1251 1251
1252 PYTHON_LIBS="${vi_cv_path_python_plibs}" 1252 PYTHON_LIBS="${vi_cv_path_python_plibs}"
1253 if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then 1253 if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
1254 PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'" 1254 PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}"
1255 else 1255 else
1256 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}\"'" 1256 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}"
1257 fi 1257 fi
1258 PYTHON_SRC="if_python.c" 1258 PYTHON_SRC="if_python.c"
1259 PYTHON_OBJ="objects/if_python.o" 1259 PYTHON_OBJ="objects/if_python.o"
1260 if test "${vi_cv_var_python_version}" = "1.4"; then 1260 if test "${vi_cv_var_python_version}" = "1.4"; then
1261 PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o" 1261 PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
1458 fi 1458 fi
1459 ]) 1459 ])
1460 1460
1461 PYTHON3_LIBS="${vi_cv_path_python3_plibs}" 1461 PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
1462 if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then 1462 if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
1463 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}\"'" 1463 PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
1464 else 1464 else
1465 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}\"'" 1465 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}"
1466 fi 1466 fi
1467 PYTHON3_SRC="if_python3.c" 1467 PYTHON3_SRC="if_python3.c"
1468 PYTHON3_OBJ="objects/if_python3.o" 1468 PYTHON3_OBJ="objects/if_python3.o"
1469 1469
1470 dnl On FreeBSD linking with "-pthread" is required to use threads. 1470 dnl On FreeBSD linking with "-pthread" is required to use threads.