Mercurial > vim

comparison src/configure.in @ 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
1124 @echo "python_LIBS='$(LIBS)'" 1124 @echo "python_LIBS='$(LIBS)'"
1125 @echo "python_SYSLIBS='$(SYSLIBS)'" 1125 @echo "python_SYSLIBS='$(SYSLIBS)'"
1126 @echo "python_LINKFORSHARED='$(LINKFORSHARED)'" 1126 @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
1127 @echo "python_DLLLIBRARY='$(DLLLIBRARY)'" 1127 @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
1128 @echo "python_INSTSONAME='$(INSTSONAME)'" 1128 @echo "python_INSTSONAME='$(INSTSONAME)'"
1129 @echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
1130 @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
1131 @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
1129 eof 1132 eof
1130 dnl -- delete the lines from make about Entering/Leaving directory 1133 dnl -- delete the lines from make about Entering/Leaving directory
1131 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" 1134 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
1132 rm -f -- "${tmp_mkf}" 1135 rm -f -- "${tmp_mkf}"
1133 if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ 1136 if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
1134 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then 1137 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
1135 vi_cv_path_python_plibs="-framework Python" 1138 vi_cv_path_python_plibs="-framework Python"
1139 if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
1140 vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
1141 fi
1136 else 1142 else
1137 if test "${vi_cv_var_python_version}" = "1.4"; then 1143 if test "${vi_cv_var_python_version}" = "1.4"; then
1138 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" 1144 vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
1139 else 1145 else
1140 vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" 1146 vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
1147 fi
1148 dnl -- Check if the path contained in python_LINKFORSHARED is
1149 dnl usable for vim build. If not, make and try other
1150 dnl candidates.
1151 if test -n "${python_LINKFORSHARED}"; then
1152 python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([[^ \t]][[^ \t]]*[[ \t]][[ \t]]*[[^ \t]][[^ \t]]*\)[[ \t]].*/\1/'`
1153 python_link_path=`echo ${python_LINKFORSHARED} | sed 's/\([[^ \t]][[^ \t]]*[[ \t]][[ \t]]*[[^ \t]][[^ \t]]*\)[[ \t]][[ \t]]*\(.*\)/\2/'`
1154 if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then
1155 dnl -- The path looks relative. Guess the absolute one using
1156 dnl the prefix and try that.
1157 python_link_path="${python_PYTHONFRAMEWORKPREFIX}/${python_link_path}"
1158 if test -n "${python_link_path}" && ! test -x "${python_link_path}"; then
1159 dnl -- A last resort.
1160 python_link_path="${python_PYTHONFRAMEWORKINSTALLDIR}/Versions/${vi_cv_var_python_version}/${python_PYTHONFRAMEWORK}"
1161 dnl -- No check is done. The last word is left to the
1162 dnl "sanity" test on link flags that follows shortly.
1163 fi
1164 python_LINKFORSHARED="${python_link_symbol} ${python_link_path}"
1165 fi
1141 fi 1166 fi
1142 vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" 1167 vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
1143 dnl remove -ltermcap, it can conflict with an earlier -lncurses 1168 dnl remove -ltermcap, it can conflict with an earlier -lncurses
1144 vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` 1169 vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
1145 fi 1170 fi