From 32749697432ac2a1b5b7ff46d2975c4c4c8950b3 Mon Sep 17 00:00:00 2001
From: billh <billh@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Date: Thu, 7 Mar 2002 14:00:18 +0000
Subject: [PATCH] Fixed Makefile bug in at-spi/util. Reverted change to
 test-simple which was made as a result of a GAIL regression.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@245 e2bd861d-eb25-0410-b326-f6ed22b6b98c
---
 ChangeLog          | 14 ++++++++++++++
 configure.in       |  3 ++-
 test/test-simple.c |  2 +-
 util/Makefile.am   |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c172d40..8fc90ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-03-07  Bill Haneman  <bill.haneman@sun.com>
+
+	* configure.in:
+	Include gdk_pixbuf_x11-2.0 in UTILS_LIBS.
+
+	* util/Makefile.am:
+	Fix regression caused by hard-coding major
+	version of gdk_pixbuf_x11; now use $(UTILS_LIBS)
+	(see above change).
+	
+	* test/test-simple.c (test_editable_text),
+	(test_test): revert previous change (error was 
+	a regression in gail which is now fixed).
+	
 2002-03-04  Michael Meeks  <michael@ximian.com>
 
 	* test/test-simple.c (test_editable_text),
diff --git a/configure.in b/configure.in
index ec7c7a0..87eebac 100644
--- a/configure.in
+++ b/configure.in
@@ -109,7 +109,8 @@ AC_SUBST(TESTS_CFLAGS)
 PKG_CHECK_MODULES(UTILS, \
 	libbonobo-2.0 >= 1.107.0 \
 	gtk+-2.0 >= 1.3.12 \
-	gdk-pixbuf-2.0 >= 1.3.0)
+	gdk-pixbuf-2.0 >= 1.3.0
+	gdk-pixbuf-xlib-2.0 >= 1.3.0)
 AC_SUBST(UTILS_LIBS)
 AC_SUBST(UTILS_CFLAGS)
 
diff --git a/test/test-simple.c b/test/test-simple.c
index 7f04c3c..f66139a 100644
--- a/test/test-simple.c
+++ b/test/test-simple.c
@@ -34,7 +34,7 @@
 
 /* Known bugs */
 #undef  KEY_IMPL_WORKS
-#define WHOLE_STRING G_MAXINT
+#define WHOLE_STRING -1
 
 static void validate_accessible (Accessible *accessible,
 				 gboolean    has_parent,
diff --git a/util/Makefile.am b/util/Makefile.am
index 6f85795..910d145 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -53,7 +53,7 @@ IDLFLAGS = -I$(BONOBO_ACTIVATION_IDL_DIR) 	\
 
 orbittypelibdir = $(libdir)/orbit
 
-LDADD = $(UTILS_LIBS) -L$(prefix)/lib -lgdk_pixbuf_xlib-1.3
+LDADD = $(UTILS_LIBS)
 
 serverinfodir = $(libdir)/bonobo/servers
 serverinfo_DATA = Accessibility_Util.server
-- 
2.7.4