Remove redundant flags.

* s/freebsd.h (C_SWITCH_SYSTEM):
* s/hpux10-20.h (C_SWITCH_X_SYSTEM, LD_SWITCH_X_DEFAULT):
* s/netbsd.h (C_SWITCH_SYSTEM):
* s/openbsd.h (LD_SWITCH_X_DEFAULT): Remove, configure takes care
of these.

5 files changed, 7 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b88ea4108ae..d1ca5ac7886 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2010-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        Remove redundant flags.
+        * s/freebsd.h (C_SWITCH_SYSTEM):
+        * s/hpux10-20.h (C_SWITCH_X_SYSTEM, LD_SWITCH_X_DEFAULT):
+        * s/netbsd.h (C_SWITCH_SYSTEM):
+        * s/openbsd.h (LD_SWITCH_X_DEFAULT): Remove, configure takes care
+        of these.
+
         Simplify m/intel386.h.
         * m/intel386.h (CRT0_DUMMIES): Remove, inline value in the only
         user: ecrt0.c.
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index ce90f3f99e0..d8aaa833265 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -69,13 +69,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    ioctl TIOCSCTTY.  */
 #define DONT_REOPEN_PTY
 
-/* 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
-
 /* Circumvent a bug in FreeBSD.  In the following sequence of
    writes/reads on a PTY, read(2) returns bogus data:
 
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 0ac37cb3c87..b7dab37760e 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -153,11 +153,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    We used to use -lc -lcurses, but this may be cleaner.  */
 #define LIBS_TERMCAP -ltermcap
 
-/* However, HPUX 10 puts Xaw and Xmu in a strange place
-   (if you install them at all).  So search that place.  */
-#define C_SWITCH_X_SYSTEM  -I/usr/include/X11R6 -I/usr/include/X11R5 -I/usr/include/Motif1.2 -I/usr/contrib/X11R6/include -I/usr/contrib/X11R5/include
-#define LD_SWITCH_X_DEFAULT -L/usr/lib/X11R6 -L/usr/lib/X11R5 -L/usr/lib/Motif1.2 -L/usr/contrib/X11R5/lib
-
 /* 2000-11-21: Temporarily disable Unix 98 large file support found by
    configure.  It fails on HPUX 11, at least, because it enables
    header sections which lose when `static' is defined away, as it is
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index d9c6a1fd3f3..ee5d5b3f898 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -49,13 +49,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 -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
-   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/pkg/include -I/usr/local/include -L/usr/pkg/lib -L/usr/local/lib
-
 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
    the library search parth, i.e. it won't search /usr/lib
    for libc and friends. Using -nostartfiles instead avoids
diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index c71aea4c9d4..461af7f3964 100644
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -23,9 +23,5 @@
       is necessary,  otherwise Emacs dumps core on elf systems.  */
 #define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Z
 
-/* The version of gcc on OpenBSD doesn't search /usr/local/lib by
-   default.  */
-#define LD_SWITCH_X_DEFAULT -L/usr/local/lib
-
 /* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
    (do not change this comment) */