Mercurial > vim
changeset 9871:945b165fa831 v7.4.2210
commit https://github.com/vim/vim/commit/cff50f5ec9e8c8c8f69bdcb7fc17e0b9ced540e2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 14 17:32:52 2016 +0200
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 https://github.com/vim/vim/issues/980)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 14 Aug 2016 17:45:06 +0200 |
| parents | affc5f26634d |
| children | e41c72cb16e5 |
| files | src/auto/configure src/configure.in src/version.c |
| diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5988,7 +5988,7 @@ else 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
--- 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