On Sun, 4 Apr 2004, Luke Mewburn wrote:
> Hubert; can you add the appropriate CPPFLAGS lines as you detect
> them to fix your build.  Once it works, feel free to send the
> diff by me for review, or commit appropriately and I'll try
> and check it post commit.

Yes... the patch below gets me through a 'make build' in src/x11 for
src-2.0 and xsrc-2.0. Please review & commit.

Now off to see what's with these various errors i get for 'build.sh
release' on various platforms...


 - Hubert

Index: Xserver/GL/GLcore/Makefile.GLcore
===================================================================
RCS file: /cvsroot/src/x11/Xserver/GL/GLcore/Makefile.GLcore,v
retrieving revision 1.5
diff -u -r1.5 Makefile.GLcore
--- Xserver/GL/GLcore/Makefile.GLcore	7 Mar 2004 13:50:25 -0000	1.5
+++ Xserver/GL/GLcore/Makefile.GLcore	4 Apr 2004 22:27:53 -0000
@@ -62,6 +62,7 @@
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
  		-I${X11SRCDIR.xc}/extras/Mesa/include \
 		-I${X11SRCDIR.xc}/lib/GL/include \
+		-I${X11SRCDIR.xc}/lib/GL/glx \
  		-I${X11SRCDIR.xc}/extras/Mesa/src \
 		-I${X11SRCDIR.xc}/programs/Xserver/include \
 		-I${XSERVERINCDIR} \
Index: Xserver/os/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/os/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Xserver/os/Makefile	6 Mar 2004 03:31:08 -0000	1.10
+++ Xserver/os/Makefile	4 Apr 2004 22:27:53 -0000
@@ -15,6 +15,7 @@
 		-I${XSERVERINCDIR} \
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
+		-I${X11SRCDIR.xc}/lib/xtrans \
 		-I${X11SRCDIR.xc}/programs/Xserver/Xext \
 		-I${X11SRCDIR.xc}/include/fonts \
 		-I${X11SRCDIR.xc}/programs/Xserver/render \
Index: Xserver/printer/Makefile
===================================================================
RCS file: /cvsroot/src/x11/Xserver/printer/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Xserver/printer/Makefile	10 Jan 2004 16:28:29 -0000	1.5
+++ Xserver/printer/Makefile	4 Apr 2004 22:27:53 -0000
@@ -17,6 +17,7 @@

 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xc}/programs/Xserver/Xprint \
+		-I${X11SRCDIR.xc}/programs/Xserver/Xext \
 		-I${X11SRCDIR.xc}/programs/Xserver/mfb \
 		-I${X11SRCDIR.xc}/programs/Xserver/mi \
 		-I${X11SRCDIR.xc}/programs/Xserver/cfb \
Index: bin/lbxproxy/Makefile
===================================================================
RCS file: /cvsroot/src/x11/bin/lbxproxy/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- bin/lbxproxy/Makefile	17 Nov 2003 05:18:20 -0000	1.4
+++ bin/lbxproxy/Makefile	4 Apr 2004 22:27:53 -0000
@@ -16,6 +16,7 @@
 		-I${X11SRCDIR.xc}/programs/${PROG}/include \
 		${X11FLAGS.SERVER}

+CPPFLAGS+=		-I${X11SRCDIR.xc}/lib/xtrans	# for Xtransint.h - HF
 CPPFLAGS.dispatch.c=	${X11FLAGS.EXTENSION}
 CPPFLAGS.utils.c=	-DDEF_ATOMS_FILE=\"${X11LIBDIR}/lbxproxy/AtomControl\" \
 			-DRGB_DB=\"${X11LIBDIR}/rgb\"
Index: lib/FS/Makefile
===================================================================
RCS file: /cvsroot/src/x11/lib/FS/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- lib/FS/Makefile	20 Oct 2003 05:12:40 -0000	1.5
+++ lib/FS/Makefile	4 Apr 2004 22:27:54 -0000
@@ -5,6 +5,8 @@
 LIB=	FS
 .PATH:	${X11SRCDIR.xc}/lib/${LIB}
 .PATH:	${X11SRCDIR.xc}/lib/xtrans
+CPPFLAGS+=	-I${X11SRCDIR.xc}/lib/${LIB}
+CPPFLAGS+=	-I${X11SRCDIR.xc}/lib/xtrans

 SRCS=	FSClServ.c FSCloseFt.c FSConnServ.c FSErrDis.c FSErrHndlr.c \
 	FSFlush.c FSFontInfo.c FSFtNames.c FSGetCats.c FSListCats.c \
Index: lib/GL/Makefile
===================================================================
RCS file: /cvsroot/src/x11/lib/GL/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- lib/GL/Makefile	6 Mar 2004 03:05:39 -0000	1.5
+++ lib/GL/Makefile	4 Apr 2004 22:27:54 -0000
@@ -19,9 +19,10 @@
 .PATH:		${X11SRCDIR.xc}/extras/Mesa/src/X86
 SRCS.glx+=	glapi_x86.S
 .for fn in ${SRCS.glx}
-CPPFLAGS.${fn}=	-DUSE_X86_ASM
+CPPFLAGS+=	-DUSE_X86_ASM
+CPPFLAGS+=	-I${X11SRCDIR.xc}/extras/Mesa/src/X86
 .endfor
-.endif
+.endif # i386


 .if ${X11DRI} != "no"
Index: lib/expat/Makefile
===================================================================
RCS file: /cvsroot/src/x11/lib/expat/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- lib/expat/Makefile	6 Mar 2004 03:05:39 -0000	1.5
+++ lib/expat/Makefile	4 Apr 2004 22:27:54 -0000
@@ -7,6 +7,8 @@
 .PATH:	${DIST}
 .PATH:	${X11SRCDIR.xc}/extras/expat/lib

+CPPFLAGS+=	-I${X11SRCDIR.xc}/extras/expat/lib
+
 SRCS=	xmlparse.c xmlrole.c xmltok.c

 .include "Makefile.expatdefs"
Index: lib/font/Makefile
===================================================================
RCS file: /cvsroot/src/x11/lib/font/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- lib/font/Makefile	6 Mar 2004 03:05:39 -0000	1.7
+++ lib/font/Makefile	4 Apr 2004 22:27:54 -0000
@@ -41,6 +41,7 @@
 .for fn in ${SRCS.fc}
 CPPFLAGS.${fn}=	-I${DESTDIR}${X11INCDIR}/X11/fonts \
 		-I${X11SRCDIR.xc}/lib/font/include \
+		-I${X11SRCDIR.xc}/lib/xtrans \
 		-I${X11SRCDIR.xc}/include/fonts
 CPPFLAGS.${fn}+=${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_CLIENT \
 		-DTRANS_SERVER -DTRANS_REOPEN -DBSD44SOCKETS

-- 
Hubert Feyrer <hubert@feyrer.de>