gnome-python r632 - in trunk: . bonobo gconf gnome gnomecanvas

[bjornl svn gnome org]

Author: bjornl
Date: Sat Aug 23 13:15:24 2008
New Revision: 632
URL: http://svn.gnome.org/viewvc/gnome-python?rev=632&view=rev

Log:
2008-08-23  BjÃrn Lindqvist  <bjourne gmail com>

	Bug 548535 â pygtk-codegen-2.0 -> pygobject-codegen-2.0

	* configure.ac: Check for pygobject-codegen-2.0 instead. Fallback
	on pygtk-codegen-2.0 if not found.


Modified:
   trunk/ChangeLog
   trunk/bonobo/Makefile.am
   trunk/configure.ac
   trunk/gconf/Makefile.am
   trunk/gnome/Makefile.am
   trunk/gnomecanvas/Makefile.am

Modified: trunk/bonobo/Makefile.am
==============================================================================
--- trunk/bonobo/Makefile.am	(original)
+++ trunk/bonobo/Makefile.am	Sat Aug 23 13:15:24 2008
@@ -62,7 +62,7 @@
 
 .defs.c:
 	(cd $(srcdir) \
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGNOME_CODEGEN) \
 	    --py_ssize_t-clean \
 	    --load-types bonobo-arg-types.py \
 	    --register $(PYGTK_DEFSDIR)/pango-types.defs \

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Aug 23 13:15:24 2008
@@ -70,9 +70,16 @@
 dnl check for pygtk
 PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version)
 AC_SUBST(PYGTK_CFLAGS)
-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)
+
+dnl check for codegen script
+AC_PATH_PROG(PYGNOME_CODEGEN, pygobject-codegen-2.0, no)
+if test "x$PYGNOME_CODEGEN" = xno; then
+  dnl This is for compat with older releases when codegen was shipped
+  dnl in pygtk. It should be removed in future releases.
+  AC_PATH_PROG(PYGNOME_CODEGEN, pygtk-codegen-2.0, no)
+  if test "x$PYGNOME_CODEGEN" = xno; then
+    AC_MSG_ERROR(could not find pygobject-codegen-2.0 script)
+  fi
 fi
 
 AC_MSG_CHECKING([for conflicting pygtk versions])

Modified: trunk/gconf/Makefile.am
==============================================================================
--- trunk/gconf/Makefile.am	(original)
+++ trunk/gconf/Makefile.am	Sat Aug 23 13:15:24 2008
@@ -31,7 +31,7 @@
 
 .defs.c:
 	(cd $(srcdir) \
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGNOME_CODEGEN) \
 	    --py_ssize_t-clean \
 	    --load-types gconf-arg-types.py \
 	    --override $*.override \

Modified: trunk/gnome/Makefile.am
==============================================================================
--- trunk/gnome/Makefile.am	(original)
+++ trunk/gnome/Makefile.am	Sat Aug 23 13:15:24 2008
@@ -48,7 +48,7 @@
 
 .defs.c:
 	(cd $(srcdir) \
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGNOME_CODEGEN) \
 	    --py_ssize_t-clean \
 	    --load-types ../bonobo/bonobo-arg-types.py \
 	    --register $(PYGTK_DEFSDIR)/pango-types.defs \

Modified: trunk/gnomecanvas/Makefile.am
==============================================================================
--- trunk/gnomecanvas/Makefile.am	(original)
+++ trunk/gnomecanvas/Makefile.am	Sat Aug 23 13:15:24 2008
@@ -24,7 +24,7 @@
 
 .defs.c:
 	(cd $(srcdir) \
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGNOME_CODEGEN) \
 	    --py_ssize_t-clean \
 	    --load-types ../bonobo/bonobo-arg-types.py \
 	    --register $(PYGTK_DEFSDIR)/pango-types.defs \