diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-03-24 15:14:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-03-24 15:14:27 +0100 |
| commit | a161e26d558204311f6e76208fa4cd3b2dbbab0b (patch) | |
| tree | 87e5938cec264281dd12cb0329b15d4dbc2834eb /src | |
| parent | 6c927557e2b0b2fbc2dfc91f604bf1117d0bf77a (diff) | |
updated for version 7.4.677v7.4.677
Problem: Configure fails when specifying a python-config-dir. (Lcd)
Solution: Check if PYTHONFRAMEWORKPREFIX is set.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index b5d1782983..a52d6977cc 100755 --- 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 diff --git a/src/configure.in b/src/configure.in index 9d8121530e..be3c6587fe 100644 --- 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 diff --git a/src/version.c b/src/version.c index 86a59978d3..086b6fdebb 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 677, +/**/ 676, /**/ 675, |