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 e6589de856828a04914a516069277a78fa044bcd..b42f601db2ff6b9d36715654eadd7f1073e39c84 100755 (executable)
--- 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 504aca67b360b75e8669d3cdcc798a573516c6a6..c0a60b227717fed4591e68a6def90907ad6953bf 100644 (file)
--- 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 cd3a52883ac04dbdf36760940bf5783c9edd28d8..4c8ed6eaad36bf0374cfb3de41607362445275d1 100644 (file)
--- 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,
 /**/