From 1187403e64947b4e1a9ef50648b1c493f8f1a3eb Mon Sep 17 00:00:00 2001
From: cshapiro <cshapiro>
Date: Wed, 27 Feb 2008 23:30:46 +0000
Subject: [PATCH] Remove X11 from the search path for include files.

---
 lisp/Config.FreeBSD           | 2 +-
 lisp/Config.FreeBSD_gencgc    | 4 ++--
 lisp/Config.NetBSD            | 2 +-
 lisp/Config.NetBSD_gencgc     | 2 +-
 lisp/Config.OpenBSD           | 2 +-
 lisp/Config.OpenBSD_gencgc    | 2 +-
 lisp/Config.amd64             | 2 +-
 lisp/Config.hp700_ux90        | 2 +-
 lisp/Config.linux             | 2 +-
 lisp/Config.linux_gencgc      | 2 +-
 lisp/Config.parisc_mach       | 2 +-
 lisp/Config.pmax_mach         | 2 +-
 lisp/Config.ppc_darwin        | 2 +-
 lisp/Config.sun4_mach         | 2 +-
 lisp/Config.sun4_solaris_gcc  | 2 +-
 lisp/Config.sun4_solaris_sunc | 2 +-
 lisp/Config.sun4c_41          | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lisp/Config.FreeBSD b/lisp/Config.FreeBSD
index 8d90dbc18..f76630ba9 100644
--- a/lisp/Config.FreeBSD
+++ b/lisp/Config.FreeBSD
@@ -2,7 +2,7 @@ PATH1 = ../../src/lisp
 vpath %.h $(PATH1)
 vpath %.c $(PATH1)
 vpath %.S $(PATH1)
-CPPFLAGS = -I. -I$(PATH1) -I- -I/usr/X11R6/include
+CPPFLAGS = -I. -I$(PATH1) -I-
 CC = gcc
 LD = ld
 CPP = cpp
diff --git a/lisp/Config.FreeBSD_gencgc b/lisp/Config.FreeBSD_gencgc
index 86fe4e941..cb7263b05 100644
--- a/lisp/Config.FreeBSD_gencgc
+++ b/lisp/Config.FreeBSD_gencgc
@@ -6,9 +6,9 @@ CC = gcc
 LD = ld
 CPP = cpp
 ifneq (,$(filter 2% 3%, $(shell $(CC) -dumpversion)))
-CPPFLAGS = -I. -I$(PATH1) -I- -I/usr/X11R6/include
+CPPFLAGS = -I. -I$(PATH1) -I-
 else
-CPPFLAGS = -iquote . -iquote $(PATH1) -I/usr/X11R6/include
+CPPFLAGS = -iquote . -iquote $(PATH1)
 endif
 CFLAGS = -Wstrict-prototypes -Wall -O2 -g -DGENCGC -DLINKAGE_TABLE
 ASFLAGS = -g -DGENCGC -DLINKAGE_TABLE
diff --git a/lisp/Config.NetBSD b/lisp/Config.NetBSD
index 230b71fd5..1cbffa7dd 100644
--- a/lisp/Config.NetBSD
+++ b/lisp/Config.NetBSD
@@ -2,7 +2,7 @@ PATH1 = ../../src/lisp
 vpath %.h $(PATH1)
 vpath %.c $(PATH1)
 vpath %.S $(PATH1)
-CPPFLAGS = -I. -I$(PATH1) -I- -I/usr/X11R6/include
+CPPFLAGS = -I. -I$(PATH1) -I-
 CC = gcc
 LD = ld
 CPP = cpp
diff --git a/lisp/Config.NetBSD_gencgc b/lisp/Config.NetBSD_gencgc
index 8836dbe05..aed1949f5 100644
--- a/lisp/Config.NetBSD_gencgc
+++ b/lisp/Config.NetBSD_gencgc
@@ -3,7 +3,7 @@ ARCH = $(shell uname -m)
 vpath %.h $(PATH1)
 vpath %.c $(PATH1)
 vpath %.S $(PATH1)
-CPPFLAGS = -I. -I$(PATH1) -I- -I/usr/X11R6/include
+CPPFLAGS = -I. -I$(PATH1) -I-
 CC = gcc -pipe
 LD = ld
 CPP = cpp
diff --git a/lisp/Config.OpenBSD b/lisp/Config.OpenBSD
index dc59f4127..f01549cd8 100644
--- a/lisp/Config.OpenBSD
+++ b/lisp/Config.OpenBSD
@@ -2,7 +2,7 @@ PATH1 = ../../src/lisp
 vpath %.h $(PATH1)
 vpath %.c $(PATH1)
 vpath %.S $(PATH1)
-CPPFLAGS = -I. -I$(PATH1) -I- -I/usr/X11R6/include
+CPPFLAGS = -I. -I$(PATH1) -I-
 CC = gcc
 LD = ld
 CPP = cpp
diff --git a/lisp/Config.OpenBSD_gencgc b/lisp/Config.OpenBSD_gencgc
index cf2b82df3..d93bf1bcc 100644
--- a/lisp/Config.OpenBSD_gencgc
+++ b/lisp/Config.OpenBSD_gencgc
@@ -2,7 +2,7 @@ PATH1 = ../../src/lisp
 vpath %.h $(PATH1)
 vpath %.c $(PATH1)
 vpath %.S $(PATH1)
-CPPFLAGS = -I. -I$(PATH1) -I- -I/usr/X11R6/include
+CPPFLAGS = -I. -I$(PATH1) -I-
 CC = gcc
 LD = ld
 CPP = cpp
diff --git a/lisp/Config.amd64 b/lisp/Config.amd64
index 82ae2c447..dc2b82eec 100644
--- a/lisp/Config.amd64
+++ b/lisp/Config.amd64
@@ -2,7 +2,7 @@ PATH1 = ../../src/lisp
 vpath %.h $(PATH1)
 vpath %.c $(PATH1)
 vpath %.S $(PATH1)
-CPPFLAGS = -I. -I$(PATH1) -I- -I/usr/X11R6/include
+CPPFLAGS = -I. -I$(PATH1) -I-
 CC = gcc
 LD = ld
 CPP = cpp
diff --git a/lisp/Config.hp700_ux90 b/lisp/Config.hp700_ux90
index f06af46d0..20a2aed4c 100644
--- a/lisp/Config.hp700_ux90
+++ b/lisp/Config.hp700_ux90
@@ -1,5 +1,5 @@
 CPPFLAGS = -Dparisc -I. -I/usr/cygnus/lib/gcc-lib/hppa1.1-hp-hpux9.05/2.6-95q3/include \
-	-I/usr/include -I/usr/include/X11R5
+	-I/usr/include
 LINK.o = gcc $(LDFLAGS) $(TARGET_ARCH)
 CC = gcc
 NM = hpux-nm
diff --git a/lisp/Config.linux b/lisp/Config.linux
index 72e0055c2..5f7dbc675 100644
--- a/lisp/Config.linux
+++ b/lisp/Config.linux
@@ -2,7 +2,7 @@ PATH1 = ../../src/lisp
 vpath %.h $(PATH1)
 vpath %.c $(PATH1)
 vpath %.S $(PATH1)
-CPPFLAGS = -I. -I$(PATH1) -I- -I/usr/X11R6/include
+CPPFLAGS = -I. -I$(PATH1) -I-
 CC = gcc -m32
 LD = ld
 CPP = cpp
diff --git a/lisp/Config.linux_gencgc b/lisp/Config.linux_gencgc
index 6e8ddb3da..6c5cadf41 100644
--- a/lisp/Config.linux_gencgc
+++ b/lisp/Config.linux_gencgc
@@ -20,7 +20,7 @@ endif
 
 RUNTIME = $(GENCGC) $(LINKAGE)
 # __NO_CTYPE so builds on glibc 2.3 will run on (some) older glibc's.
-CPPFLAGS = -D__NO_CTYPE -D_GNU_SOURCE -I. -I$(PATH1) -I- -I/usr/X11R6/include $(RUNTIME)
+CPPFLAGS = -D__NO_CTYPE -D_GNU_SOURCE -I. -I$(PATH1) -I- $(RUNTIME)
 
 CFLAGS = -rdynamic -Wstrict-prototypes -Wall -O2 -g $(RUNTIME)
 ASFLAGS = -g $(GENCGC) $(LINKAGE_TABLE)
diff --git a/lisp/Config.parisc_mach b/lisp/Config.parisc_mach
index 40d3817ca..cc66e6ff6 100644
--- a/lisp/Config.parisc_mach
+++ b/lisp/Config.parisc_mach
@@ -1,5 +1,5 @@
 CPPFLAGS = -Dparisc -Dhpux -DMACH \
-	-I. -I/usr/misc/.X11/include -I/usr/mach/include -Ihacks
+	-I. -I/usr/mach/include -Ihacks
 LINK.o = /usr/src/mach/bin/cc $(LDFLAGS) $(TARGET_ARCH)
 CC = /usr/src/mach/bin/cc
 NM = hacks/my-nm
diff --git a/lisp/Config.pmax_mach b/lisp/Config.pmax_mach
index da0e82a35..8b1caa31a 100644
--- a/lisp/Config.pmax_mach
+++ b/lisp/Config.pmax_mach
@@ -1,4 +1,4 @@
-CPPFLAGS = -I. -I/usr/misc/.X11/include -I/usr/mach/include
+CPPFLAGS = -I. -I/usr/mach/include
 CC = gcc # -Wall -Wstrict-prototypes -Wmissing-prototypes
 CPP = /usr/cs/lib/cpp
 CFLAGS = -O
diff --git a/lisp/Config.ppc_darwin b/lisp/Config.ppc_darwin
index decd700dd..23d58c3bd 100644
--- a/lisp/Config.ppc_darwin
+++ b/lisp/Config.ppc_darwin
@@ -2,7 +2,7 @@ PATH1 = ../../src/lisp
 vpath %.h $(PATH1)
 vpath %.c $(PATH1)
 vpath %.S $(PATH1)
-CPPFLAGS = -I. -I$(PATH1) -I/usr/X11R6/include
+CPPFLAGS = -I. -I$(PATH1)
 # For Mac OS X 10.2, gcc3 is appropriate.  For 10.4, gcc (gcc 4.0) is ok.  But
 # this means -traditional is needed because gcc 4 seems to handle '##'
 # differently from gcc-3.3.  I (rtoy) don't know which is right, but I
diff --git a/lisp/Config.sun4_mach b/lisp/Config.sun4_mach
index 0b75a3ae2..4e02ed9c9 100644
--- a/lisp/Config.sun4_mach
+++ b/lisp/Config.sun4_mach
@@ -1,4 +1,4 @@
-CPPFLAGS = -I. -I/usr/misc/.X11/include
+CPPFLAGS = -I.
 CC = gcc # -Wall -Wstrict-prototypes -Wmissing-prototypes
 CPP = /usr/cs/lib/cpp
 CFLAGS = -g
diff --git a/lisp/Config.sun4_solaris_gcc b/lisp/Config.sun4_solaris_gcc
index 890e91385..855186090 100644
--- a/lisp/Config.sun4_solaris_gcc
+++ b/lisp/Config.sun4_solaris_gcc
@@ -38,7 +38,7 @@ GENCGC = -DGENCGC
 GC_SRC = gencgc.c
 endif
 
-CPPFLAGS = -I. -I$(PATH1) -I/usr/openwin/include -I/usr/include/X11 -DSOLARIS -DSOLARIS25 -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC)
+CPPFLAGS = -I. -I$(PATH1) -DSOLARIS -DSOLARIS25 -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC)
 
 # Note: If you want to be able to run gdb with cmucl, the only version
 # of gdb that still works for me (rtoy) on Solaris is 4.18.  Versions
diff --git a/lisp/Config.sun4_solaris_sunc b/lisp/Config.sun4_solaris_sunc
index 427d9825d..6f14af523 100644
--- a/lisp/Config.sun4_solaris_sunc
+++ b/lisp/Config.sun4_solaris_sunc
@@ -35,7 +35,7 @@ GENCGC = -DGENCGC
 GC_SRC = gencgc.c
 endif
 
-CPPFLAGS = -Dinline= -I. -I$(PATH1) -I/usr/openwin/include -I/usr/include/X11 -DSOLARIS -DSOLARIS25 -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC)
+CPPFLAGS = -Dinline= -I. -I$(PATH1) -DSOLARIS -DSOLARIS25 -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC)
 
 
 CC = cc -O -xlibmieee
diff --git a/lisp/Config.sun4c_41 b/lisp/Config.sun4c_41
index cee9f47f4..50e23256f 100644
--- a/lisp/Config.sun4c_41
+++ b/lisp/Config.sun4c_41
@@ -1,4 +1,4 @@
-CPPFLAGS = -I. -I/usr/misc/.X11/include -DSUNOS
+CPPFLAGS = -I. -DSUNOS
 CC = gcc # -Wall -Wstrict-prototypes -Wmissing-prototypes
 CPP = /lib/cpp
 CFLAGS = -O
-- 
GitLab