added check for pygtk-codegen-2.0 and pygobject-codegen-2.0 as the latter

replaced the former in pygobject/pygtk trunk.  (closes: #549002)

svn path=/trunk/; revision=1376

diff --git a/configure.ac b/configure.ac
index e4dd6ffa05acfe4f9187d6ccc3d637090a3e94e2..cb7af39d23b02474f6c10d279043f67d1997bb0b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -268,6 +268,7 @@ if test "x$enable_python" != "xno"; then
       ], 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

diff --git a/python/pyempathy/Makefile.am b/python/pyempathy/Makefile.am
index a2b76b26432231de7199a148758442353abeab2e..a7efea3671954e3c9b3ab3af2f0d5edbcb5be6fc 100644 (file)
--- a/python/pyempathy/Makefile.am
+++ b/python/pyempathy/Makefile.am
@@ -27,7 +27,7 @@ empathy_la_LDFLAGS =                                  \
        -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     \

diff --git a/python/pyempathygtk/Makefile.am b/python/pyempathygtk/Makefile.am
index 39f776b27da23a1f40d23a5e3dc9f571bad2194a..d44e1f4ab1c74cb731f65be510bb8ce8eb6929fd 100644 (file)
--- a/python/pyempathygtk/Makefile.am
+++ b/python/pyempathygtk/Makefile.am
@@ -27,7 +27,7 @@ empathygtk_la_LDFLAGS =                                       \
        -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                     \