diff options
| author | Nalin Dahyabhai <nalin@src.gnome.org> | 2002-06-14 16:47:43 +0000 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@src.gnome.org> | 2002-06-14 16:47:43 +0000 |
| commit | ac7de676d72e7c1fe73a094ed5c65855a2567bb9 (patch) | |
| tree | 99f9e6695cbb023c470692c20a309b6f309d1fb6 | |
| parent | 82b2469479942e963fdae942d14dbff20ea08cf1 (diff) | |
| download | vte-ac7de676d72e7c1fe73a094ed5c65855a2567bb9.tar.gz | |
Handle cases where pygtk isn't installed in the prefix we're configuring
* configure.in, python/Makefile.am: Handle cases where pygtk isn't installed
in the prefix we're configuring for.
* src/Makefile.am: Link libvte to its library dependencies.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | python/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
4 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2002-06-14 nalin + * configure.in, python/Makefile.am: Handle cases where pygtk isn't + installed in the prefix we're configuring for. + * src/Makefile.am: Link libvte to its library dependencies. 2002-06-13 nalin * src/vteaccess.c: Stop watching for hierarchy-changed signals -- the accessible container which is our parent handles it already (from msw). diff --git a/configure.in b/configure.in index 0ab9619d..46de73ca 100644 --- a/configure.in +++ b/configure.in @@ -71,6 +71,8 @@ AC_MSG_CHECKING([for pygtk-2.0]) if pkg-config --exists pygtk-2.0 ; then AC_MSG_RESULT([found]) PKG_CHECK_MODULES(PYGTK,[pygtk-2.0]) + PYGTK_DATADIR=`pkg-config --variable=datadir pygtk-2.0` + AC_SUBST(PYGTK_DATA) AM_PATH_PYTHON AC_MSG_CHECKING(for python >= 2.2) prog=" diff --git a/python/Makefile.am b/python/Makefile.am index 811af5a3..c541da16 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -13,4 +13,4 @@ vtemodule_so_LDFLAGS = -shared vtemodule_so_LDADD = $(top_builddir)/src/libvte.la @LIBS@ @PYGTK_LIBS@ @XFT_LIBS@ @GTK_LIBS@ @X_LIBS@ vte.c: vte.defs vte.override - pygtk-codegen-2.0 -p py$(PACKAGE) -o vte.override --register $(datadir)/pygtk/2.0/defs/gtk-types.defs --register $(datadir)/pygtk/2.0/defs/gdk-types.defs --register $(datadir)/pygtk/2.0/defs/pango-types.defs $< > $@ + pygtk-codegen-2.0 -p py$(PACKAGE) -o vte.override --register @PYGTK_DATADIR@/pygtk/2.0/defs/gtk-types.defs --register @PYGTK_DATADIR@/pygtk/2.0/defs/gdk-types.defs --register @PYGTK_DATADIR@/pygtk/2.0/defs/pango-types.defs $< > $@ diff --git a/src/Makefile.am b/src/Makefile.am index 9007af93..d2383c67 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,8 @@ libvte_la_SOURCES = \ vteaccess.c \ vteaccess.h +libvte_la_LIBADD = @LIBS@ @XFT_LIBS@ @GTK_LIBS@ @X_LIBS@ + CLEANFILES = marshal.c marshal.h marshal.c marshal.h: marshal.list |