Bug 410986 – Fails to build with -z defs

2007-02-26  Chris Wilson  <chris@chris-wilson.co.uk>

	Bug 410986 – Fails to build with -z defs

	The forgotten half - the python module also fails to link.

	* acinclude.m4:
	* python/Makefile.am:
		Add PYTHON_LIBS pointing to the customary location and
		remember to include them when compiling vtemodule.so.

svn path=/trunk/; revision=1763

diff --git a/ChangeLog b/ChangeLog
index 8fe1762..e147ce2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-02-26  Chris Wilson  <chris@chris-wilson.co.uk>
+
+       Bug 410986 – Fails to build with -z defs
+
+       The forgotten half - the python module also fails to link.
+
+       * acinclude.m4:
+       * python/Makefile.am:
+               Add PYTHON_LIBS pointing to the customary location and
+               remember to include them when compiling vtemodule.so.
+
 2007-02-26  Chris Wilson  <chris@chris-wilson.co.uk>
 
        Bug 412361 – Yet another mouse selection regression...

diff --git a/acinclude.m4 b/acinclude.m4
index a139d45..71b3ad7 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -13,7 +13,9 @@ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
 if test "$py_prefix" != "$py_exec_prefix"; then
   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
 fi
+PYTHON_LIBS="-L${py_prefix}/libs -lpython${PYTHON_VERSION}"
 AC_SUBST(PYTHON_INCLUDES)
+AC_SUBST(PYTHON_LIBS)
 dnl check if the headers exist:
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"

diff --git a/python/Makefile.am b/python/Makefile.am
index e8baf8f..edad74e 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -10,7 +10,7 @@ CLEANFILES = vte.c
 
 vtemodule_la_CFLAGS = $(VTE_CFLAGS) $(X_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS)
 vtemodule_la_SOURCES = vtemodule.c
-vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
+vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(PYTHON_LIBS) $(VTE_LIBS) $(X_LIBS)
 vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte
 nodist_vtemodule_la_SOURCES = vte.c