From 1270031d86a63187c6112c144b5f1a83cf15f510 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 18 Sep 2001 11:31:02 +0000 Subject: [PATCH] (C_SWITCH_SYSTEM): Add. (LD_SWITCH_SYSTEM): Include /usr/local/lib. --- src/ChangeLog | 3 +++ src/s/netbsd.h | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index f6891ec274b..f4e4fdf5d59 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2001-09-18 Gerd Moellmann + * s/netbsd.h (C_SWITCH_SYSTEM): Add. + (LD_SWITCH_SYSTEM): Include /usr/local/lib. + * xdisp.c (try_window_id) [!GLYPH_DEBUG]: Give up if first_unchanged_at_end_row is in front of last_unchanged_at_beg_row. This code should be removed after the diff --git a/src/s/netbsd.h b/src/s/netbsd.h index b101ca456de..d65244a0bfa 100644 --- a/src/s/netbsd.h +++ b/src/s/netbsd.h @@ -76,7 +76,16 @@ /* 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 `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,/'` +#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp /usr/local/lib + +/* The following is needed to make `configure' find Xpm, Xaw3d and + image include and library files if using /usr/bin/gcc. That + 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/local/include -L/usr/local/lib + #endif /* __ELF__ */ /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears -- 2.39.2