Bug#566842: vim: Don't use MODLIBS when building with python interpreter support and python2.6

[Michael Bienia]

Package: vim
Version: 2:7.2.330-1
Severity: normal
Tags: patch

Hello,

vim's configure script uses MODLIBS from python's config/Makefile to
know to link against which libs. As MODLIBS uses LOCALMODLIBS for it's
value and as I got told that LOCALMODLIBS shouldn't be used for python
extensions (I assume this applies here too as vim links against
libpython2.x like python extensions):

"LOCALMODLIBS is a macro used to link the python binary against libaries
needed for the binary. It must not used to link extensions."
(from Matthias Klose in an Ubuntu bug)

Without the attached patch, I got a problem building vim with python
interpreter support when doing a merge for Ubuntu (the sanity check for
python failed as it tried to link against -lssl and libssl-dev is not in
the build dependencies). With this change the python interpreter support
got build and as far as I can tell works too (checked with my changes to
ftplugin/debchangelog.vim (see other bug)).

Michael

--- vim-7.2.330.orig/src/configure.in
+++ vim-7.2.330/src/configure.in
@@ -709,7 +709,7 @@
 	    tmp_mkf="$pwd/config-PyMake$$"
 	    cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}"
 __:
-	@echo "python_MODLIBS='$(MODLIBS)'"
+	@echo "python_BASEMODLIBS='$(BASEMODLIBS)'"
 	@echo "python_LIBS='$(LIBS)'"
 	@echo "python_SYSLIBS='$(SYSLIBS)'"
 	@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@@ -726,7 +726,7 @@
 	      else
 		  vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
 	      fi
-	      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+	      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
 	      dnl remove -ltermcap, it can conflict with an earlier -lncurses
 	      vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
 	    fi
--- vim-7.2.330.orig/src/auto/configure
+++ vim-7.2.330/src/auto/configure
@@ -5153,7 +5153,7 @@
 	    tmp_mkf="$pwd/config-PyMake$$"
 	    cat -- "${PYTHON_CONFDIR}/Makefile" - <<'eof' >"${tmp_mkf}"
 __:
-	@echo "python_MODLIBS='$(MODLIBS)'"
+	@echo "python_BASEMODLIBS='$(BASEMODLIBS)'"
 	@echo "python_LIBS='$(LIBS)'"
 	@echo "python_SYSLIBS='$(SYSLIBS)'"
 	@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
@@ -5169,7 +5169,7 @@
 	      else
 		  vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
 	      fi
-	      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+	      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
 	      	      vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
 	    fi