(C_SWITCH_SYSTEM): Add.

(LD_SWITCH_SYSTEM): Include /usr/local/lib.

diff --git a/src/ChangeLog b/src/ChangeLog
index f6891ec274bdc44e5ddf3c957d00f7213abf8567..f4e4fdf5d5958ada9da21777517db19218cd0673 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-09-18  Gerd Moellmann  <gerd@gnu.org>
 
+       * 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 b101ca456de2ae1e7e0c474ea3bee87cfa050750..d65244a0bfa78b375645a2cf890ec09c4e718053 100644 (file)
--- 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