Mercurial > vim

comparison src/auto/configure @ 6706:c8ff693e9ebc v7.4.677

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.677 Problem: Configure fails when specifying a python-config-dir. (Lcd) Solution: Check if PYTHONFRAMEWORKPREFIX is set.
author Bram Moolenaar <bram@vim.org>
date Tue, 24 Mar 2015 15:14:27 +0100
parents 692bc2c52002
children 809e3aa59c6f
comparison
equal deleted inserted replaced
6705:f289eb84040a 6706:c8ff693e9ebc
5904 if test "${vi_cv_var_python_version}" = "1.4"; then 5904 if test "${vi_cv_var_python_version}" = "1.4"; then
5905 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" 5905 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
5906 else 5906 else
5907 vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" 5907 vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
5908 fi 5908 fi
5909 if test -n "${python_LINKFORSHARED}"; then 5909 if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
5910 python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` 5910 python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'`
5911 python_link_path=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t][ \t]*\(.*\)/\2/'` 5911 python_link_path=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t][ \t]*\(.*\)/\2/'`
5912 if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then 5912 if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then
5913 python_link_path="${python_PYTHONFRAMEWORKPREFIX}/${python_link_path}" 5913 python_link_path="${python_PYTHONFRAMEWORKPREFIX}/${python_link_path}"
5914 if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then 5914 if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then