diff -up at-spi-1.25.2/atk-bridge/Makefile.am.unneeded-deps at-spi-1.25.2/atk-bridge/Makefile.am
--- at-spi-1.25.2/atk-bridge/Makefile.am.unneeded-deps	2007-12-03 01:16:10.000000000 -0500
+++ at-spi-1.25.2/atk-bridge/Makefile.am	2008-12-10 11:44:34.000000000 -0500
@@ -33,4 +33,4 @@ libatk_bridge_la_LDFLAGS =  	\
 
 libatk_bridge_la_LIBADD = \
 	$(top_builddir)/libspi/libspi.la	\
-	$(ATK_BRIDGE_LIBS)	
+	$(ATK_BRIDGE_LIBS) $(X_LIBS)
diff -up at-spi-1.25.2/configure.in.unneeded-deps at-spi-1.25.2/configure.in
--- at-spi-1.25.2/configure.in.unneeded-deps	2008-12-01 01:52:24.000000000 -0500
+++ at-spi-1.25.2/configure.in	2008-12-10 11:48:47.000000000 -0500
@@ -77,7 +77,7 @@ AC_PATH_XTRA
 if test x$no_x = xyes ; then
 	AC_MSG_ERROR([X development libraries not found])
 else
-	X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+        X_LIBS="$X_LIBS -lX11"
 fi
 
 AC_SUBST(X_LIBS)
@@ -144,7 +144,6 @@ LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variab
 AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
 AC_SUBST(LIBBONOBO_IDL_DIR)
 
-LIBS="$LIBS $X_LIBS"
 dnl path to Xtst
 AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
 	AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])],
diff -up at-spi-1.25.2/cspi/Makefile.am.unneeded-deps at-spi-1.25.2/cspi/Makefile.am
--- at-spi-1.25.2/cspi/Makefile.am.unneeded-deps	2007-06-05 03:16:57.000000000 -0400
+++ at-spi-1.25.2/cspi/Makefile.am	2008-12-10 11:44:34.000000000 -0500
@@ -14,7 +14,7 @@ libcspi_la_LDFLAGS = @LDFLAGS@ @LT_VERSI
 
 LDADD =				\
 	$(top_builddir)/libspi/libspi.la	\
-	$(LIBCSPI_LIBS) $(X_LIBS)
+	$(LIBCSPI_LIBS) 
 
 libcspidir = $(includedir)/at-spi-1.0/cspi
 libcspi_HEADERS =		\
diff -up at-spi-1.25.2/libspi/Makefile.am.unneeded-deps at-spi-1.25.2/libspi/Makefile.am
--- at-spi-1.25.2/libspi/Makefile.am.unneeded-deps	2007-11-28 01:43:23.000000000 -0500
+++ at-spi-1.25.2/libspi/Makefile.am	2008-12-10 11:44:34.000000000 -0500
@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)	\
            $(X_CFLAGS)
 
 libspi_la_LDFLAGS = @LT_VERSION_INFO@ -no-undefined
-libspi_la_LIBADD = $(LIBSPI_LIBS) $(XTST_LIBS)
+libspi_la_LIBADD = $(LIBSPI_LIBS)
 
 libspiincludedir = $(includedir)/at-spi-1.0/libspi