Mercurial > vim
comparison src/configure.ac @ 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 | 825841608429 |
children | 4ee47b5f2640 |
comparison
equal
deleted
inserted
replaced
13627:ec331c768b68 | 13628:b59806681b98 |
---|---|
1155 | 1155 |
1156 dnl -- where the Python implementation library archives are | 1156 dnl -- where the Python implementation library archives are |
1157 | 1157 |
1158 AC_ARG_WITH(python-config-dir, | 1158 AC_ARG_WITH(python-config-dir, |
1159 [ --with-python-config-dir=PATH Python's config directory], | 1159 [ --with-python-config-dir=PATH Python's config directory], |
1160 [ vi_cv_path_python_conf="${withval}" ] ) | 1160 [ vi_cv_path_python_conf="${withval}"; have_python_config_dir=1 ] ) |
1161 | 1161 |
1162 AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf, | 1162 AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python_conf, |
1163 [ | 1163 [ |
1164 vi_cv_path_python_conf= | 1164 vi_cv_path_python_conf= |
1165 d=`${vi_cv_path_python} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"` | 1165 d=`${vi_cv_path_python} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"` |
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}" | 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}" | 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 if test "X$have_python_config_dir" = "X1"; then | |
1259 dnl Define PYTHON_HOME if --with-python-config-dir was used | |
1260 PYTHON_CFLAGS="${PYTHON_CFLAGS} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'" | |
1261 | |
1262 fi | |
1258 PYTHON_SRC="if_python.c" | 1263 PYTHON_SRC="if_python.c" |
1259 PYTHON_OBJ="objects/if_python.o" | 1264 PYTHON_OBJ="objects/if_python.o" |
1260 if test "${vi_cv_var_python_version}" = "1.4"; then | 1265 if test "${vi_cv_var_python_version}" = "1.4"; then |
1261 PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o" | 1266 PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o" |
1262 fi | 1267 fi |
1397 | 1402 |
1398 dnl -- where the Python implementation library archives are | 1403 dnl -- where the Python implementation library archives are |
1399 | 1404 |
1400 AC_ARG_WITH(python3-config-dir, | 1405 AC_ARG_WITH(python3-config-dir, |
1401 [ --with-python3-config-dir=PATH Python's config directory], | 1406 [ --with-python3-config-dir=PATH Python's config directory], |
1402 [ vi_cv_path_python3_conf="${withval}" ] ) | 1407 [ vi_cv_path_python3_conf="${withval}"; have_python3_config_dir=1 ] ) |
1403 | 1408 |
1404 AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf, | 1409 AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf, |
1405 [ | 1410 [ |
1406 vi_cv_path_python3_conf= | 1411 vi_cv_path_python3_conf= |
1407 config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" | 1412 config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" |
1462 if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then | 1467 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}" | 1468 PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" |
1464 else | 1469 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}" | 1470 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 | 1471 fi |
1472 if test "X$have_python3_config_dir" = "X1"; then | |
1473 dnl Define PYTHON3_HOME if --with-python-config-dir was used | |
1474 PYTHON3_CFLAGS="${PYTHON3_CFLAGS} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'" | |
1475 fi | |
1467 PYTHON3_SRC="if_python3.c" | 1476 PYTHON3_SRC="if_python3.c" |
1468 PYTHON3_OBJ="objects/if_python3.o" | 1477 PYTHON3_OBJ="objects/if_python3.o" |
1469 | 1478 |
1470 dnl On FreeBSD linking with "-pthread" is required to use threads. | 1479 dnl On FreeBSD linking with "-pthread" is required to use threads. |
1471 dnl _THREAD_SAFE must be used for compiling then. | 1480 dnl _THREAD_SAFE must be used for compiling then. |