gnome-python r636 - trunk

[mraudsepp svn gnome org]

Author: mraudsepp
Date: Mon Sep 22 10:15:55 2008
New Revision: 636
URL: http://svn.gnome.org/viewvc/gnome-python?rev=636&view=rev

Log:
Bug 548535 â configure broken with old pygtk-codegen-2.0 on
system instead of pygobject-codegen-2.0

* configure.ac: Restore compatibility with pygtk-codegen-2.0 by
considering with autoconf caching mechanics.


Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Sep 22 10:15:55 2008
@@ -72,14 +72,18 @@
 AC_SUBST(PYGTK_CFLAGS)
 
 dnl check for codegen script
-AC_PATH_PROG(PYGNOME_CODEGEN, pygobject-codegen-2.0, no)
-if test "x$PYGNOME_CODEGEN" = xno; then
+AC_PATH_PROG(PYGOBJECT_CODEGEN, pygobject-codegen-2.0, no)
+if test "x$PYGOBJECT_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_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
+  if test "x$PYGTK_CODEGEN" = xno; then
     AC_MSG_ERROR(could not find pygobject-codegen-2.0 script)
+  else
+    AC_SUBST(PYGNOME_CODEGEN, $PYGTK_CODEGEN)
   fi
+else
+  AC_SUBST(PYGNOME_CODEGEN, $PYGOBJET_CODEGEN)
 fi
 
 AC_MSG_CHECKING([for conflicting pygtk versions])