7.3.218

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.218
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.218 (after 7.3.212)
  11 Problem:    Tiny configuration problem with Python 3.
  12 Solution:   Add abiflags in one more place. (Andreas Behr)
  13 Files:      src/auto/configure, src/configure.in
  14
  15
  16 *** ../mercurial/vim73/src/auto/configure       2011-06-12 21:37:06.000000000 +0200
  17 --- src/auto/configure  2011-06-13 01:26:50.000000000 +0200
  18 ***************
  19 *** 5607,5613 ****
  20         @echo "python3_BASEMODLIBS='$(BASEMODLIBS)'"
  21         @echo "python3_LIBS='$(LIBS)'"
  22         @echo "python3_SYSLIBS='$(SYSLIBS)'"
  23 -       @echo "python3_LINKFORSHARED='$(LINKFORSHARED)'"
  24         @echo "python3_INSTSONAME='$(INSTSONAME)'"
  25   eof
  26                       eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
  27 --- 5607,5612 ----
  28 ***************
  29 *** 5624,5630 ****
  30         if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
  31           PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
  32         else
  33 !         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
  34         fi
  35         PYTHON3_SRC="if_python3.c"
  36               if test "x$MACOSX" = "xyes"; then
  37 --- 5623,5629 ----
  38         if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
  39           PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
  40         else
  41 !         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
  42         fi
  43         PYTHON3_SRC="if_python3.c"
  44               if test "x$MACOSX" = "xyes"; then
  45 *** ../mercurial/vim73/src/configure.in 2011-06-12 21:37:06.000000000 +0200
  46 --- src/configure.in    2011-06-13 01:26:35.000000000 +0200
  47 ***************
  48 *** 1063,1069 ****
  49         @echo "python3_BASEMODLIBS='$(BASEMODLIBS)'"
  50         @echo "python3_LIBS='$(LIBS)'"
  51         @echo "python3_SYSLIBS='$(SYSLIBS)'"
  52 -       @echo "python3_LINKFORSHARED='$(LINKFORSHARED)'"
  53         @echo "python3_INSTSONAME='$(INSTSONAME)'"
  54   eof
  55             dnl -- delete the lines from make about Entering/Leaving directory
  56 --- 1063,1068 ----
  57 ***************
  58 *** 1080,1086 ****
  59         if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
  60           PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
  61         else
  62 !         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
  63         fi
  64         PYTHON3_SRC="if_python3.c"
  65         dnl For Mac OSX 10.2 config.o is included in the Python library.
  66 --- 1079,1085 ----
  67         if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
  68           PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
  69         else
  70 !         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
  71         fi
  72         PYTHON3_SRC="if_python3.c"
  73         dnl For Mac OSX 10.2 config.o is included in the Python library.
  74 *** ../vim-7.3.217/src/version.c        2011-06-13 01:19:48.000000000 +0200
  75 --- src/version.c       2011-06-13 01:29:42.000000000 +0200
  76 ***************
  77 *** 711,712 ****
  78 --- 711,714 ----
  79   {   /* Add new patch number below this line */
  80 + /**/
  81 +     218,
  82   /**/
  83
  84 --
  85 hundred-and-one symptoms of being an internet addict:
  86 174. You know what a listserv is.
  87
  88  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  89 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  90 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  91  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///