diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2007-02-26 21:34:01 +0000 |
|---|---|---|
| committer | Chris Wilson <cpwilson@src.gnome.org> | 2007-02-26 21:34:01 +0000 |
| commit | 7da79f11f4a591986bba428bbb00bb427c7a41ad (patch) | |
| tree | fc0ad3c910fa1244b8c6042369831a5fc706a79b | |
| parent | 47c6e35de305edaf30cc0544641da9bea87c0779 (diff) | |
| download | vte-7da79f11f4a591986bba428bbb00bb427c7a41ad.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | python/Makefile.am | 2 |
3 files changed, 14 insertions, 1 deletions
@@ -1,5 +1,16 @@ 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... Part 2. diff --git a/acinclude.m4 b/acinclude.m4 index a139d454..71b3ad7b 100644 --- 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 e8baf8f5..edad74e1 100644 --- 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 |