[src/trunk]: src/external/mit/xorg/server/xorg-server Ensure that HAVE_DIX_CO...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1bc0a1cc5cd2
branches:  trunk
changeset: 760879:1bc0a1cc5cd2
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Jan 15 13:54:52 2011 +0000

description:
Ensure that HAVE_DIX_CONFIG_H is defined for damageext, dbe, exa, and glx
builds. Fixes recent trouble with the Composite extension, and should fix
some problems with the DAMAGE extension and who knows what else.

diffstat:

 external/mit/xorg/server/xorg-server/damageext/Makefile |  5 +++--
 external/mit/xorg/server/xorg-server/dbe/Makefile.dbe   |  6 ++++--
 external/mit/xorg/server/xorg-server/exa/Makefile.exa   |  5 +++--
 external/mit/xorg/server/xorg-server/glx/Makefile.glx   |  5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diffs (76 lines):

diff -r 5779e1c355cf -r 1bc0a1cc5cd2 external/mit/xorg/server/xorg-server/damageext/Makefile
--- a/external/mit/xorg/server/xorg-server/damageext/Makefile   Sat Jan 15 12:31:56 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/damageext/Makefile   Sat Jan 15 13:54:52 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2009/08/22 02:40:26 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2011/01/15 13:54:52 jmcneill Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -15,7 +15,8 @@
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/xorg \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
-               -I${X11SRCDIR.xorg-server}/../include
+               -I${X11SRCDIR.xorg-server}/../include \
+               ${X11FLAGS.DIX} ${X11INCS.DIX}
 
 COPTS.damageext.c+=    -Wno-error
 
diff -r 5779e1c355cf -r 1bc0a1cc5cd2 external/mit/xorg/server/xorg-server/dbe/Makefile.dbe
--- a/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe     Sat Jan 15 12:31:56 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/dbe/Makefile.dbe     Sat Jan 15 13:54:52 2011 +0000
@@ -1,11 +1,13 @@
-#      $NetBSD: Makefile.dbe,v 1.5 2009/06/11 05:43:15 mrg Exp $
+#      $NetBSD: Makefile.dbe,v 1.6 2011/01/15 13:54:53 jmcneill Exp $
 
 .PATH:         ${X11SRCDIR.xorg-server}/dbe
 SRCS.dbe=      dbe.c midbe.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/include \
                -I${X11SRCDIR.xorg-server}/Xext \
-               -I${DESTDIR}${X11INCDIR}/pixman-1
+               -I${DESTDIR}${X11INCDIR}/pixman-1 \
+               -I${X11SRCDIR.xorg-server}/../include \
+               ${X11FLAGS.DIX} ${X11INCS.DIX}
 
 .include <bsd.x11.mk>
 LIBDIR=        ${XMODULEDIR}
diff -r 5779e1c355cf -r 1bc0a1cc5cd2 external/mit/xorg/server/xorg-server/exa/Makefile.exa
--- a/external/mit/xorg/server/xorg-server/exa/Makefile.exa     Sat Jan 15 12:31:56 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/exa/Makefile.exa     Sat Jan 15 13:54:52 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.exa,v 1.4 2010/11/23 08:22:30 mrg Exp $
+#      $NetBSD: Makefile.exa,v 1.5 2011/01/15 13:54:53 jmcneill Exp $
 
 .PATH:         ${X11SRCDIR.xorg-server}/exa
 
@@ -23,7 +23,8 @@
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/xorg \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
-               -I${X11SRCDIR.xorg-server}/../include
+               -I${X11SRCDIR.xorg-server}/../include \
+               ${X11FLAGS.DIX} ${X11INCS.DIX}
 
 .if !defined(XMODULEDIR)
 .include <bsd.x11.mk>
diff -r 5779e1c355cf -r 1bc0a1cc5cd2 external/mit/xorg/server/xorg-server/glx/Makefile.glx
--- a/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Sat Jan 15 12:31:56 2011 +0000
+++ b/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Sat Jan 15 13:54:52 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.glx,v 1.7 2010/11/23 08:22:30 mrg Exp $
+#      $NetBSD: Makefile.glx,v 1.8 2011/01/15 13:54:53 jmcneill Exp $
 
 .PATH: ${X11SRCDIR.xorg-server}/glx
 .PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -60,7 +60,8 @@
 CPPFLAGS+= \
        -DGLXEXT \
        -DGLX_USE_MESA \
-       ${X11FLAGS.DIX}
+       -I${X11SRCDIR.xorg-server}/../include \
+       ${X11FLAGS.DIX} ${X11INCS.DIX}
 
 .include <bsd.x11.mk>
 LIBDIR=        ${XMODULEDIR}