Update.

2005-11-08  Kjartan Maraas  <kmaraas@gnome.org>

	* NEWS: Update.
	* Makefile.am:
	* autogen.sh:
	* configure.in:
	* python/Makefile.am:
	I'm attaching a patch that modernizes the python binding
	build stuff. Notably, it excludes python/vte.c from the dist.
	Right now as it stands, the file is disted, which means people's
	builds will not work unless they build against pygtk 2.8,
	which makes this bug somewhat important. Patch from Manish Sing
	Closes bug #320931.

6 files changed, 45 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 5cf080c7..59eb20bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-11-08  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* NEWS: Update.
+	* Makefile.am:
+	* autogen.sh:
+	* configure.in:
+	* python/Makefile.am:
+	I'm attaching a patch that modernizes the python binding 
+	build stuff. Notably, it excludes python/vte.c from the dist.
+	Right now as it stands, the file is disted, which means people's 
+	builds will not work unless they build against pygtk 2.8, 
+	which makes this bug somewhat important. Patch from Manish Sing
+	Closes bug #320931.
+
 2005-11-01  Bill Haneman <billh@gnome.org>
 
 	* src/vteaccess.c: 
diff --git a/Makefile.am b/Makefile.am
index ca27fbbd..f9bbe6cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = src python termcaps po doc
-EXTRA_DIST = HACKING vte.spec vte.pc.in vte-uninstalled.pc.in MESSAGE-OF-DOOM
+EXTRA_DIST = HACKING vte.spec vte.pc.in vte-uninstalled.pc.in
 if BUILD_GNOME_PTY_HELPER
 SUBDIRS += gnome-pty-helper
 endif
diff --git a/NEWS b/NEWS
index 025e4d89..e40e96e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+0.11.16  - Optimize memory used for fonts (Mike Hearn)
+	 - Fix crasher with accessibility (Padraig O'Briain)
+	 - Fix some warning from GDK (Michele Baldessari)
+	 - Fix python build problems (Manish Sing)
+
 0.11.15  - Fix check for recvmsg () (Robert Basch)
 	 - Make it possible to implement atkText selection methods
 	   for VteAccessible. Bug #113590. (Padraig O'Briain)
diff --git a/autogen.sh b/autogen.sh
index e9e79707..a1fa5e5c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -103,7 +103,6 @@ automake-$automakev -a -c $am_opt
 $autoconf
 
 cd gnome-pty-helper
-$autoheader
 aclocal-$automakev $ACLOCAL_FLAGS
 $autoheader
 automake-$automakev -a -c $am_opt
diff --git a/configure.in b/configure.in
index 3e91e28d..3329a9c3 100644
--- a/configure.in
+++ b/configure.in
@@ -363,8 +363,16 @@ if $BUILD_PYTHON ; then
 	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_DATADIR)
+
+		AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
+		if test "x$PYGTK_CODEGEN" = xno; then
+		  AC_MSG_ERROR(could not find pygtk-codegen-2.0 script)
+		fi
+
+		AC_MSG_CHECKING(for pygtk defs)
+		PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+		AC_SUBST(PYGTK_DEFSDIR)
+		AC_MSG_RESULT($PYGTK_DEFSDIR)
 	else
 		AC_MSG_RESULT([not found])
 		BUILD_PYTHON=false
diff --git a/python/Makefile.am b/python/Makefile.am
index 833eb387..c18d1800 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = vte.defs vte.override
+EXTRA_DIST = vte.defs vte.override cat.py unrealize.py vte-demo.py
 
 PYTHON_MODULES = vtemodule.la
 
@@ -9,11 +9,22 @@ pythonsiteexec_LTLIBRARIES = $(PYTHON_MODULES)
 CLEANFILES = vte.c
 
 vtemodule_la_CFLAGS = @VTE_CFLAGS@ @X_CFLAGS@ @PYTHON_INCLUDES@ @PYGTK_CFLAGS@
-vtemodule_la_SOURCES = vtemodule.c vte.c
+vtemodule_la_SOURCES = vtemodule.c
 vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la @LIBS@ @PYGTK_LIBS@ @VTE_LIBS@ @X_LIBS@
-vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex=initvte
+vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte
+nodist_vtemodule_la_SOURCES = vte.c
 
 vte.c: vte.defs vte.override
-	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 $< > $@
+
+.defs.c:
+	(cd $(srcdir) \
+	 && $(PYGTK_CODEGEN) \
+            --register $(PYGTK_DEFSDIR)/pango-types.defs \
+            --register $(PYGTK_DEFSDIR)/gdk-types.defs \
+            --register $(PYGTK_DEFSDIR)/gtk-types.defs \
+            --override $*.override \
+            --prefix py$* $*.defs) > gen-$*.c \
+        && cp gen-$*.c $*.c \
+        && rm -f gen-$*.c
 
 endif