diff -u emacs-21.3/src/s/gnu-linux.h~ emacs-21.3/src/s/gnu-linux.h

--- emacs-21.3/src/s/gnu-linux.h~	2004-03-08 19:23:36.000000000 +0900

+++ emacs-21.3/src/s/gnu-linux.h	2004-03-08 19:23:36.000000000 +0900

@@ -183,7 +183,8 @@

 #ifdef __mips__

 #define LD_SWITCH_SYSTEM -G 0 LD_SWITCH_X_SITE_AUX

 #else

-#define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX

+/* RH: don't want /usr/X11R6/lib rpath'ed */

+#define LD_SWITCH_SYSTEM

 #endif /* __mips__ */

 /* Link temacs with -z nocombreloc so that unexec works right, whether or