[pygobject] Add Python version into installed libpyglib name

[Paul Pogonyshev <paulp src gnome org>]

commit 82ad6b8c8ea4d6694126f5e0e67b826717e38f19
Author: Emilio Pozuelo Monfort <pochu ubuntu com>
Date:   Sun May 24 22:55:16 2009 +0300

    Add Python version into installed libpyglib name
    
    Do this now, while no-one (as far as we know) links to the library
    besides PyGObject itself.  Bug #550235.
---
 configure.ac        |    2 ++
 gio/Makefile.am     |    2 +-
 glib/Makefile.am    |   10 +++++-----
 gobject/Makefile.am |    2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2942de2..478f4d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,8 @@ AM_PATH_GLIB_2_0(glib_required_version,,[AC_MSG_ERROR(maybe you want the pygobje
 if test -n "$export_dynamic"; then
   GLIB_LIBS=`echo $GLIB_LIBS | sed -e "s/$export_dynamic//"`
 fi
+PYTHON_BASENAME=`basename $PYTHON`
+AC_SUBST([PYTHON_BASENAME])
 
 pygobject_CODEGEN_DEFINES=""
 AC_SUBST([pygobject_CODEGEN_DEFINES])
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 48b7a97..b430b8e 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -56,7 +56,7 @@ EXTRA_DIST += $(GIO_DEFS) $(GIO_OVERRIDES)
 gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
 _gio_la_CFLAGS = $(GIO_CFLAGS)
 _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
-_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0.la
+_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2 0- PYTHON_BASENAME@.la
 _gio_la_SOURCES = \
 	giomodule.c \
 	pygio-utils.c \
diff --git a/glib/Makefile.am b/glib/Makefile.am
index b471259..d230da4 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
 pkgincludedir = $(includedir)/pygtk-2.0
 pkginclude_HEADERS = pyglib.h
 
-lib_LTLIBRARIES = libpyglib-2.0.la
+lib_LTLIBRARIES = libpyglib-2 0- PYTHON_BASENAME@.la
 
 pkgpyexecdir = $(pyexecdir)/gtk-2.0
 
@@ -19,9 +19,9 @@ if PLATFORM_WIN32
 common_ldflags += -no-undefined
 endif
 
-libpyglib_2_0_la_CFLAGS = $(GLIB_CFLAGS)
-libpyglib_2_0_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
-libpyglib_2_0_la_SOURCES = 	\
+libpyglib_2_0_ PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
+libpyglib_2_0_ PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
+libpyglib_2_0_ PYTHON_BASENAME@_la_SOURCES = 	\
 	pyglib.c		\
 	pyglib.h		\
 	pyglib-private.h 	\
@@ -29,7 +29,7 @@ libpyglib_2_0_la_SOURCES = 	\
 
 _glib_la_CFLAGS = $(GLIB_CFLAGS)
 _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
-_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0.la
+_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2 0- PYTHON_BASENAME@.la
 _glib_la_SOURCES = 	 	\
 	glibmodule.c	 	\
 	pygiochannel.c 	 	\
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index cab4e86..fa0ea20 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -42,7 +42,7 @@ _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_gobject|PyInit__
 _gobject_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(FFI_LIBS) \
-	$(top_builddir)/glib/libpyglib-2.0.la
+	$(top_builddir)/glib/libpyglib-2 0- PYTHON_BASENAME@.la
 _gobject_la_SOURCES =           \
         gobjectmodule.c         \
         pygboxed.c              \