Mercurial > vim

comparison src/auto/configure @ 13628:b59806681b98 v8.0.1686

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
5953 5953
5954 5954
5955 5955
5956 # Check whether --with-python-config-dir was given. 5956 # Check whether --with-python-config-dir was given.
5957 if test "${with_python_config_dir+set}" = set; then : 5957 if test "${with_python_config_dir+set}" = set; then :
5958 withval=$with_python_config_dir; vi_cv_path_python_conf="${withval}" 5958 withval=$with_python_config_dir; vi_cv_path_python_conf="${withval}"; have_python_config_dir=1
5959 fi 5959 fi
5960 5960
5961 5961
5962 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5 5962 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5
5963 $as_echo_n "checking Python's configuration directory... " >&6; } 5963 $as_echo_n "checking Python's configuration directory... " >&6; }
6060 if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then 6060 if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
6061 PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}" 6061 PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}"
6062 else 6062 else
6063 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}" 6063 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}"
6064 fi 6064 fi
6065 if test "X$have_python_config_dir" = "X1"; then
6066 PYTHON_CFLAGS="${PYTHON_CFLAGS} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
6067
6068 fi
6065 PYTHON_SRC="if_python.c" 6069 PYTHON_SRC="if_python.c"
6066 PYTHON_OBJ="objects/if_python.o" 6070 PYTHON_OBJ="objects/if_python.o"
6067 if test "${vi_cv_var_python_version}" = "1.4"; then 6071 if test "${vi_cv_var_python_version}" = "1.4"; then
6068 PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o" 6072 PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
6069 fi 6073 fi
6310 6314
6311 6315
6312 6316
6313 # Check whether --with-python3-config-dir was given. 6317 # Check whether --with-python3-config-dir was given.
6314 if test "${with_python3_config_dir+set}" = set; then : 6318 if test "${with_python3_config_dir+set}" = set; then :
6315 withval=$with_python3_config_dir; vi_cv_path_python3_conf="${withval}" 6319 withval=$with_python3_config_dir; vi_cv_path_python3_conf="${withval}"; have_python3_config_dir=1
6316 fi 6320 fi
6317 6321
6318 6322
6319 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5 6323 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5
6320 $as_echo_n "checking Python's configuration directory... " >&6; } 6324 $as_echo_n "checking Python's configuration directory... " >&6; }
6392 if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then 6396 if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
6393 PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" 6397 PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
6394 else 6398 else
6395 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}" 6399 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}"
6396 fi 6400 fi
6401 if test "X$have_python3_config_dir" = "X1"; then
6402 PYTHON3_CFLAGS="${PYTHON3_CFLAGS} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
6403 fi
6397 PYTHON3_SRC="if_python3.c" 6404 PYTHON3_SRC="if_python3.c"
6398 PYTHON3_OBJ="objects/if_python3.o" 6405 PYTHON3_OBJ="objects/if_python3.o"
6399 6406
6400 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 6407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
6401 $as_echo_n "checking if -pthread should be used... " >&6; } 6408 $as_echo_n "checking if -pthread should be used... " >&6; }