empathy r1376 - in trunk: . python/pyempathy python/pyempathygtk

[fpeters svn gnome org]

Author: fpeters
Date: Mon Aug 25 09:41:23 2008
New Revision: 1376
URL: http://svn.gnome.org/viewvc/empathy?rev=1376&view=rev

Log:
added check for pygtk-codegen-2.0 and pygobject-codegen-2.0 as the latter
replaced the former in pygobject/pygtk trunk.  (closes: #549002)


Modified:
   trunk/configure.ac
   trunk/python/pyempathy/Makefile.am
   trunk/python/pyempathygtk/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Aug 25 09:41:23 2008
@@ -268,6 +268,7 @@
       ], have_python="yes", have_python="no")
       if test "x$have_python" = "xyes" ; then
          AM_CHECK_PYTHON_HEADERS(,have_python="no")
+         AC_CHECK_PROGS([PYGOBJECTCODEGEN], [pygobject-codegen-2.0 pygtk-codegen-2.0])
       fi
    fi
 else

Modified: trunk/python/pyempathy/Makefile.am
==============================================================================
--- trunk/python/pyempathy/Makefile.am	(original)
+++ trunk/python/pyempathy/Makefile.am	Mon Aug 25 09:41:23 2008
@@ -27,7 +27,7 @@
 	-module -avoid-version
 
 pyempathy.c: pyempathy.override pyempathy.defs
-	pygtk-codegen-2.0				\
+	$(PYGOBJECTCODEGEN)				\
 		--prefix empathy 			\
 		--register $(PYDEFS)/gdk-types.defs 	\
 		--register $(PYDEFS)/gtk-types.defs 	\

Modified: trunk/python/pyempathygtk/Makefile.am
==============================================================================
--- trunk/python/pyempathygtk/Makefile.am	(original)
+++ trunk/python/pyempathygtk/Makefile.am	Mon Aug 25 09:41:23 2008
@@ -27,7 +27,7 @@
 	-module -avoid-version
 
 pyempathygtk.c: pyempathygtk.override pyempathygtk.defs
-	pygtk-codegen-2.0						\
+	$(PYGOBJECTCODEGEN)							\
 		--prefix empathy 					\
 		--register $(PYDEFS)/gdk-types.defs 			\
 		--register $(PYDEFS)/gtk-types.defs 			\