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 b5d1782..a52d697 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5906,7 +5906,7 @@
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 9d81215..be3c658 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1148,7 +1148,7 @@
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 86a5997..086b6fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 677,
+/**/
676,
/**/
675,
