From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 14 Aug 2016 15:32:52 +0000 (+0200)
Subject: patch 7.4.2210
X-Git-Tag: v7.4.2210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cff50f5ec9e8c8c8f69bdcb7fc17e0b9ced540e2;p=vim

patch 7.4.2210
Problem:    On OSX configure mixes up a Python framework and the Unix layout.
Solution:   Make configure check properly. (Tim D. Smith, closes #980)
---

diff --git a/src/auto/configure b/src/auto/configure
index e6589de85..b42f601db 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5988,7 +5988,7 @@ __:
 eof
 	    	    eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
 	    rm -f -- "${tmp_mkf}"
-	    if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
+	    if test "x$MACOSX" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
 		"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
 	      vi_cv_path_python_plibs="-framework Python"
 	      if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
diff --git a/src/configure.in b/src/configure.in
index 504aca67b..c0a60b227 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1193,7 +1193,7 @@ eof
 	    dnl -- delete the lines from make about Entering/Leaving directory
 	    eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
 	    rm -f -- "${tmp_mkf}"
-	    if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
+	    if test "x$MACOSX" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
 		"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
 	      vi_cv_path_python_plibs="-framework Python"
 	      if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
diff --git a/src/version.c b/src/version.c
index cd3a52883..4c8ed6eaa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2210,
 /**/
     2209,
 /**/