updated for version 7.4.677

Problem:    Configure fails when specifying a python-config-dir. (Lcd)
Solution:   Check if PYTHONFRAMEWORKPREFIX is set.

diff --git a/src/auto/configure b/src/auto/configure
index b5d17829835b24abe9f45132b5eb097ad46b0d24..a52d6977cca011915ef8b9b455169bdaefad888b 100755 (executable)
--- 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 9d8121530e25edd05714706f4ecfd6d3185665ce..be3c6587fe3501e6adaeeb3260ec5f2770a6ec45 100644 (file)
--- 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 86a59978d31628b64f9420262cd52a62783be8dc..086b6fdebbc998497899b34424131034c4c87054 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    677,
 /**/
     676,
 /**/