Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/dia/ChangeLog,v
retrieving revision 1.1895
diff -u -B -p -r1.1895 ChangeLog
--- ChangeLog	28 Mar 2006 19:25:53 -0000	1.1895
+++ ChangeLog	29 Mar 2006 20:40:35 -0000
@@ -1,3 +1,9 @@
+2006-03-29  Daniel Drake  <dsd@gentoo.org>
+
+	* configure.in: Use standard pkg-config expressions to check for
+	GTK+/Glib, the GTK-supplied macro's conflict with our usage of
+	$GTK_MODULES (#335422)
+
 2006-03-28  Lars Clausen  <lars@raeder.dk>
 
 	* shapes/network/mobile_phone.{png,xpm,shape}:
Index: configure.in
===================================================================
RCS file: /cvs/gnome/dia/configure.in,v
retrieving revision 1.271
diff -u -B -p -r1.271 configure.in
--- configure.in	28 Mar 2006 19:25:53 -0000	1.271
+++ configure.in	29 Mar 2006 20:40:35 -0000
@@ -52,23 +52,12 @@ AC_SUBST(APP_LIBS)
 
 dnl Checks for libraries
 
-AM_PATH_GLIB_2_0(2.6.0, :,
-  AC_MSG_ERROR([
-*** GLib 2.6.0 ior better is required. The latest version of
-*** GLib is always available from ftp://ftp.gtk.org/pub/gtk.]),
-  glib gobject)
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0 gobject-2.0)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
-AM_PATH_GTK_2_0(2.6.0, :,
-  AC_MSG_ERROR([
-*** GTK+ 2.6.0 ior better is required. The latest version of
-*** GTK+ is always available from ftp://ftp.gtk.org/pub/gtk.]),
-  )
-
-GTK_MODULES="gtk+-2.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0"
+GTK_MODULES="gtk+-2.0 >= 2.6.0 glib-2.0 >= 2.6.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0"
 PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.1.5, , 
                   AC_MSG_ERROR([Need Pango version 1.1.5 or higher]))
 PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false)