Mercurial > vim
changeset 6706:c8ff693e9ebc v7.4.677
updated for version 7.4.677
Problem: Configure fails when specifying a python-config-dir. (Lcd)
Solution: Check if PYTHONFRAMEWORKPREFIX is set.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 24 Mar 2015 15:14:27 +0100 |
| parents | f289eb84040a |
| children | fff77fccc858 |
| files | src/auto/configure src/configure.in src/version.c |
| diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5906,7 +5906,7 @@ eof else vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" fi - if test -n "${python_LINKFORSHARED}"; then + if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` python_link_path=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t][ \t]*\(.*\)/\2/'` if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then
--- a/src/configure.in +++ b/src/configure.in @@ -1148,7 +1148,7 @@ eof dnl -- Check if the path contained in python_LINKFORSHARED is dnl usable for vim build. If not, make and try other dnl candidates. - if test -n "${python_LINKFORSHARED}"; then + if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([[^ \t]][[^ \t]]*[[ \t]][[ \t]]*[[^ \t]][[^ \t]]*\)[[ \t]].*/\1/'` python_link_path=`echo ${python_LINKFORSHARED} | sed 's/\([[^ \t]][[^ \t]]*[[ \t]][[ \t]]*[[^ \t]][[^ \t]]*\)[[ \t]][[ \t]]*\(.*\)/\2/'` if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then