Index: src/s/netbsd.h
===================================================================
RCS file: /sources/emacs/emacs/src/s/netbsd.h,v
retrieving revision 1.43
diff -u -r1.43 netbsd.h
--- src/s/netbsd.h	16 Feb 2007 08:30:08 -0000	1.43
+++ src/s/netbsd.h	5 May 2007 00:12:14 -0000
@@ -105,7 +105,7 @@
 /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
    says where to find X windows at run time.  We convert it to a -rpath option
    which is what OSF1 uses.  */
-#define LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
+#define LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R\(.*\)/-Wl,-rpath,\1 -L\1 -Wl,-rpath-link,\1 /'`
 #define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib
 
 /* The following is needed to make `configure' find Xpm, Xaw3d and
@@ -113,7 +113,7 @@
    compiler seems to be modified to not find headers in
    /usr/local/include or libs in /usr/local/lib by default.  */
 
-#define C_SWITCH_SYSTEM -I/usr/X11R6/include -I/usr/pkg/include -I/usr/local/include -L/usr/pkg/lib -L/usr/local/lib
+#define C_SWITCH_SYSTEM -I/usr/X11R6/include -I/usr/pkg/include -I/usr/local/include -L/usr/X11/lib -L/usr/pkg/lib -L/usr/local/lib
 
 /* Link temacs with -z nocombreloc so that unexec works right, whether or
    not -z combreloc is the default.  GNU ld ignores unknown -z KEYWORD