[Gnash-commit] /srv/bzr/gnash/trunk r10818: Look for pygobject-codegen-2.0 first, then pygtk-codegen-2.0 next

[rob]

------------------------------------------------------------
revno: 10818
committer: address@hidden
branch nick: trunk
timestamp: Tue 2009-04-21 12:27:28 -0600
message:
  Look for pygobject-codegen-2.0 first, then pygtk-codegen-2.0 next
modified:
  macros/python.m4

=== modified file 'macros/python.m4'
--- a/macros/python.m4  2009-04-16 00:11:19 +0000
+++ b/macros/python.m4  2009-04-21 18:27:28 +0000
@@ -126,7 +126,20 @@
     has_python=no
   fi
 
-  AC_PATH_PROG(PYTHON, python, ,[${pathlist}])
+  AM_PATH_PYTHON
+  AC_PATH_PROG(PYGOBJECT_CODEGEN, pygobject-codegen-2.0, no)
+  if test "x$PYGOBJECT_CODEGEN" = xno; then
+    AC_MSG_ERROR(could not find pygobject-codegen-2.0 script)
+    AC_PATH_PROG(PYGOBJECT_CODEGEN, pygtk-codegen-2.0, no)
+    if test "x$PYGOBJECT_CODEGEN" = xno; then
+      AC_MSG_ERROR(could not find pygtk-codegen-2.0 script)
+     fi
+   fi
+
+  PKG_CHECK_MODULES(PYGTK, pygtk-2.0)
+
+  PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+  AC_SUBST(PYGTK_DEFSDIR)
 
   AC_SUBST(PYTHON_CFLAGS)  
   AC_SUBST(PYTHON_LIBS)