diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-14 17:32:52 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-14 17:32:52 +0200 |
| commit | cff50f5ec9e8c8c8f69bdcb7fc17e0b9ced540e2 (patch) | |
| tree | f1346803beac30fefe9ad593fece6b628aa91a45 | |
| parent | 35a4cfa200917dd171b1fff3cd5b6cee9add673d (diff) | |
patch 7.4.2210v7.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)
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index e6589de856..b42f601db2 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 504aca67b3..c0a60b2277 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 cd3a52883a..4c8ed6eaad 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2210, +/**/ 2209, /**/ 2208, |