Mercurial > vim

comparison src/auto/configure @ 6704:692bc2c52002 v7.4.676

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.676 Problem: On Mac, when not using the default Python framework configure doesn't do the right thing. Solution: Use a linker search path. (Kazunobu Kuriyama)
author Bram Moolenaar <bram@vim.org>
date Tue, 24 Mar 2015 12:21:33 +0100
parents 7026d6f3367f
children c8ff693e9ebc
comparison
equal deleted inserted replaced
6703:4013f16b97eb 6704:692bc2c52002
5886 @echo "python_LIBS='$(LIBS)'" 5886 @echo "python_LIBS='$(LIBS)'"
5887 @echo "python_SYSLIBS='$(SYSLIBS)'" 5887 @echo "python_SYSLIBS='$(SYSLIBS)'"
5888 @echo "python_LINKFORSHARED='$(LINKFORSHARED)'" 5888 @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
5889 @echo "python_DLLLIBRARY='$(DLLLIBRARY)'" 5889 @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
5890 @echo "python_INSTSONAME='$(INSTSONAME)'" 5890 @echo "python_INSTSONAME='$(INSTSONAME)'"
5891 @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
5892 @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
5893 @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
5891 eof 5894 eof
5892 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" 5895 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
5893 rm -f -- "${tmp_mkf}" 5896 rm -f -- "${tmp_mkf}"
5894 if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ 5897 if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
5895 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then 5898 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
5896 vi_cv_path_python_plibs="-framework Python" 5899 vi_cv_path_python_plibs="-framework Python"
5900 if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
5901 vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
5902 fi
5897 else 5903 else
5898 if test "${vi_cv_var_python_version}" = "1.4"; then 5904 if test "${vi_cv_var_python_version}" = "1.4"; then
5899 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"
5900 else 5906 else
5901 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
5909 if test -n "${python_LINKFORSHARED}"; then
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/'`
5912 if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then
5913 python_link_path="${python_PYTHONFRAMEWORKPREFIX}/${python_link_path}"
5914 if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then
5915 python_link_path="${python_PYTHONFRAMEWORKINSTALLDIR}/Versions/${vi_cv_var_python_version}/${python_PYTHONFRAMEWORK}"
5916 fi
5917 python_LINKFORSHARED="${python_link_symbol} ${python_link_path}"
5918 fi
5902 fi 5919 fi
5903 vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" 5920 vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
5904 vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` 5921 vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
5905 fi 5922 fi
5906 5923