To: vim_dev@googlegroups.com

Subject: Patch 7.3.245

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.245

Problem:    Python 3.2 libraries not correctly detected.

Solution:   Add the suffix to the library name. (Niclas Zeising)

Files:	    src/auto/configure, src/configure.in

*** ../vim-7.3.244/src/auto/configure	2011-06-13 01:32:42.000000000 +0200

--- src/auto/configure	2011-07-13 17:57:05.000000000 +0200

***************

*** 5611,5617 ****

  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="${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//`

--- 5611,5617 ----

  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_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//`

*** ../vim-7.3.244/src/configure.in	2011-06-13 01:32:42.000000000 +0200

--- src/configure.in	2011-07-13 17:57:01.000000000 +0200

***************

*** 1068,1074 ****

            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="${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//`

--- 1068,1074 ----

            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_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//`

*** ../vim-7.3.244/src/version.c	2011-07-07 17:43:37.000000000 +0200

--- src/version.c	2011-07-15 13:09:17.000000000 +0200

***************

*** 711,712 ****

--- 711,714 ----

  {   /* Add new patch number below this line */

+ /**/

+     245,

  /**/

-- 

       When danger reared its ugly head,

       He bravely turned his tail and fled

       Yes, Brave Sir Robin turned about

       And gallantly he chickened out

       Bravely taking to his feet

       He beat a very brave retreat

       Bravest of the brave Sir Robin

       Petrified of being dead

       Soiled his pants then brave Sir Robin

       Turned away and fled.

                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\  an exciting new programming language -- http://www.Zimbu.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///