From: Bram Moolenaar Date: Fri, 15 Jul 2011 11:09:51 +0000 (+0200) Subject: updated for version 7.3.245 X-Git-Tag: v7.3.245 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54ee2b8741e10906393cf85450d69d91edb3f2eb;p=vim updated for version 7.3.245 Problem: Python 3.2 libraries not correctly detected. Solution: Add the suffix to the library name. (Niclas Zeising) --- diff --git a/src/auto/configure b/src/auto/configure index 115664fa8..ea39c3f25 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5611,7 +5611,7 @@ __: eof eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" - vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}" + vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}" vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//` diff --git a/src/configure.in b/src/configure.in index 173818805..52e0600c8 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1068,7 +1068,7 @@ eof dnl -- delete the lines from make about Entering/Leaving directory eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" - vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}" + vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}" dnl remove -ltermcap, it can conflict with an earlier -lncurses vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//` diff --git a/src/version.c b/src/version.c index 423b24b86..77d3dc0eb 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 245, /**/ 244, /**/