home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 6.0.142 < prev    next >
Encoding:
Internet Message Format  |  2002-01-16  |  3.4 KB
  1. To: vim-dev@vim.org
  2. Subject: Patch 6.0.142
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=ISO-8859-1
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 6.0.142
  11. Problem:    When Python is linked statically, loading dynamic extensions might
  12.         fail.
  13. Solution:   Add an extra linking flag when needed. (Andrew Rodionoff)
  14. Files:        src/configure.in, src/auto/configure
  15.  
  16.  
  17. *** ../vim60.141/src/configure.in    Fri Jan 11 13:03:17 2002
  18. --- src/configure.in    Thu Jan 17 12:02:23 2002
  19. ***************
  20. *** 325,330 ****
  21. --- 329,335 ----
  22.       @echo "python_MODLIBS='$(MODLIBS)'"
  23.       @echo "python_LIBS='$(LIBS)'"
  24.       @echo "python_SYSLIBS='$(SYSLIBS)'"
  25. +     @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
  26.   eof
  27.           dnl -- delete the lines from make about Entering/Leaving directory
  28.           eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`"
  29. ***************
  30. *** 334,340 ****
  31.           else
  32.           vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
  33.           fi
  34. !         vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS}"
  35.           dnl remove -ltermcap, it can conflict with an earlier -lncurses
  36.           vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  37.       ])
  38. --- 339,345 ----
  39.           else
  40.           vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
  41.           fi
  42. !         vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
  43.           dnl remove -ltermcap, it can conflict with an earlier -lncurses
  44.           vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  45.       ])
  46. *** ../vim60.141/src/auto/configure    Fri Jan 11 13:03:17 2002
  47. --- src/auto/configure    Thu Jan 17 12:03:36 2002
  48. ***************
  49. *** 1580,1585 ****
  50. --- 1584,1590 ----
  51.       @echo "python_MODLIBS='$(MODLIBS)'"
  52.       @echo "python_LIBS='$(LIBS)'"
  53.       @echo "python_SYSLIBS='$(SYSLIBS)'"
  54. +     @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
  55.   eof
  56.                   eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`"
  57.           rm -f ${tmp_mkf}
  58. ***************
  59. *** 1588,1594 ****
  60.           else
  61.           vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
  62.           fi
  63. !         vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS}"
  64.                   vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  65.       
  66.   fi
  67. --- 1593,1599 ----
  68.           else
  69.           vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
  70.           fi
  71. !         vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
  72.                   vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  73.       
  74.   fi
  75. *** ../vim60.141/src/version.c    Thu Jan 17 12:09:06 2002
  76. --- src/version.c    Thu Jan 17 12:08:51 2002
  77. ***************
  78. *** 608,609 ****
  79. --- 608,611 ----
  80.   {   /* Add new patch number below this line */
  81. + /**/
  82. +     142,
  83.   /**/
  84.  
  85. -- 
  86. hundred-and-one symptoms of being an internet addict:
  87. 23. You can't call your mother...she doesn't have a modem.
  88.  
  89.  ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
  90. (((   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   )))
  91.  \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///
  92.