Karsten Hopp a54646
To: vim_dev@googlegroups.com
Karsten Hopp a54646
Subject: Patch 7.3.218
Karsten Hopp a54646
Fcc: outbox
Karsten Hopp a54646
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp a54646
Mime-Version: 1.0
Karsten Hopp a54646
Content-Type: text/plain; charset=UTF-8
Karsten Hopp a54646
Content-Transfer-Encoding: 8bit
Karsten Hopp a54646
------------
Karsten Hopp a54646
Karsten Hopp a54646
Patch 7.3.218 (after 7.3.212)
Karsten Hopp a54646
Problem:    Tiny configuration problem with Python 3.
Karsten Hopp a54646
Solution:   Add abiflags in one more place. (Andreas Behr)
Karsten Hopp a54646
Files:      src/auto/configure, src/configure.in
Karsten Hopp a54646
Karsten Hopp a54646
Karsten Hopp a54646
*** ../mercurial/vim73/src/auto/configure	2011-06-12 21:37:06.000000000 +0200
Karsten Hopp a54646
--- src/auto/configure	2011-06-13 01:26:50.000000000 +0200
Karsten Hopp a54646
***************
Karsten Hopp a54646
*** 5607,5613 ****
Karsten Hopp a54646
  	@echo "python3_BASEMODLIBS='$(BASEMODLIBS)'"
Karsten Hopp a54646
  	@echo "python3_LIBS='$(LIBS)'"
Karsten Hopp a54646
  	@echo "python3_SYSLIBS='$(SYSLIBS)'"
Karsten Hopp a54646
- 	@echo "python3_LINKFORSHARED='$(LINKFORSHARED)'"
Karsten Hopp a54646
  	@echo "python3_INSTSONAME='$(INSTSONAME)'"
Karsten Hopp a54646
  eof
Karsten Hopp a54646
                      eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
Karsten Hopp a54646
--- 5607,5612 ----
Karsten Hopp a54646
***************
Karsten Hopp a54646
*** 5624,5630 ****
Karsten Hopp a54646
        if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
Karsten Hopp a54646
          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}\\\""
Karsten Hopp a54646
        else
Karsten Hopp a54646
!         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}\\\""
Karsten Hopp a54646
        fi
Karsten Hopp a54646
        PYTHON3_SRC="if_python3.c"
Karsten Hopp a54646
              if test "x$MACOSX" = "xyes"; then
Karsten Hopp a54646
--- 5623,5629 ----
Karsten Hopp a54646
        if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
Karsten Hopp a54646
          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}\\\""
Karsten Hopp a54646
        else
Karsten Hopp a54646
!         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}\\\""
Karsten Hopp a54646
        fi
Karsten Hopp a54646
        PYTHON3_SRC="if_python3.c"
Karsten Hopp a54646
              if test "x$MACOSX" = "xyes"; then
Karsten Hopp a54646
*** ../mercurial/vim73/src/configure.in	2011-06-12 21:37:06.000000000 +0200
Karsten Hopp a54646
--- src/configure.in	2011-06-13 01:26:35.000000000 +0200
Karsten Hopp a54646
***************
Karsten Hopp a54646
*** 1063,1069 ****
Karsten Hopp a54646
  	@echo "python3_BASEMODLIBS='$(BASEMODLIBS)'"
Karsten Hopp a54646
  	@echo "python3_LIBS='$(LIBS)'"
Karsten Hopp a54646
  	@echo "python3_SYSLIBS='$(SYSLIBS)'"
Karsten Hopp a54646
- 	@echo "python3_LINKFORSHARED='$(LINKFORSHARED)'"
Karsten Hopp a54646
  	@echo "python3_INSTSONAME='$(INSTSONAME)'"
Karsten Hopp a54646
  eof
Karsten Hopp a54646
            dnl -- delete the lines from make about Entering/Leaving directory
Karsten Hopp a54646
--- 1063,1068 ----
Karsten Hopp a54646
***************
Karsten Hopp a54646
*** 1080,1086 ****
Karsten Hopp a54646
        if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
Karsten Hopp a54646
          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}\\\""
Karsten Hopp a54646
        else
Karsten Hopp a54646
!         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}\\\""
Karsten Hopp a54646
        fi
Karsten Hopp a54646
        PYTHON3_SRC="if_python3.c"
Karsten Hopp a54646
        dnl For Mac OSX 10.2 config.o is included in the Python library.
Karsten Hopp a54646
--- 1079,1085 ----
Karsten Hopp a54646
        if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
Karsten Hopp a54646
          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}\\\""
Karsten Hopp a54646
        else
Karsten Hopp a54646
!         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}\\\""
Karsten Hopp a54646
        fi
Karsten Hopp a54646
        PYTHON3_SRC="if_python3.c"
Karsten Hopp a54646
        dnl For Mac OSX 10.2 config.o is included in the Python library.
Karsten Hopp a54646
*** ../vim-7.3.217/src/version.c	2011-06-13 01:19:48.000000000 +0200
Karsten Hopp a54646
--- src/version.c	2011-06-13 01:29:42.000000000 +0200
Karsten Hopp a54646
***************
Karsten Hopp a54646
*** 711,712 ****
Karsten Hopp a54646
--- 711,714 ----
Karsten Hopp a54646
  {   /* Add new patch number below this line */
Karsten Hopp a54646
+ /**/
Karsten Hopp a54646
+     218,
Karsten Hopp a54646
  /**/
Karsten Hopp a54646
Karsten Hopp a54646
-- 
Karsten Hopp a54646
hundred-and-one symptoms of being an internet addict:
Karsten Hopp a54646
174. You know what a listserv is.
Karsten Hopp a54646
Karsten Hopp a54646
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp a54646
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp a54646
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp a54646
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///