--- Makefile.old	2007-05-29 22:11:40.000000000 -0600
+++ Makefile	2007-05-29 22:50:42.000000000 -0600
@@ -343,11 +343,8 @@
 	GNOME_Magnifier-imodule.c
 
 
-# The X_LIBS must be searched first, since the DEPS_LIBS are setted by a call
-# to pkg-config and can contain a path to X libraries, other way the
-# functionalities finded during the test that setted X_LIBS can not be
-# presented in the final link.
-LDADD = $(X_LIBS) $(DEPS_LIBS) libgnome-mag.la $(POPT_LIBS) $(COLORBLIND_LIBS)
+# The X_LIBS must NOT be searched first or it breaks the build
+LDADD = libgnome-mag.la $(DEPS_LIBS) $(X_LIBS) $(POPT_LIBS) $(COLORBLIND_LIBS)
 serverinfodir = $(libdir)/bonobo/servers
 server_in_files = GNOME_Magnifier.server.in
 serverinfo_DATA = $(server_in_files:.server.in=.server)