xserver ChangeLog,3.359,3.360 configure.ac,3.103,3.104

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver
In directory gabe:/tmp/cvs-serv25750

Modified Files:
	ChangeLog configure.ac 
Log Message:
2005-08-07  Keith Packard  <keithp at keithp.com>

	* configure.ac:
	* dix/dispatch.c:
	* dix/events.c:
	* dix/glyphcurs.c:
	* dix/main.c:
	* dix/swaprep.c:
	* dix/xpstubs.c:
	* fb/fbglyph.c:
	* hw/kdrive/chips/chipsdraw.c:
	* hw/kdrive/ephyr/hostx.c: (hostx_screen_init):
	* hw/kdrive/epson/epson13806draw.c:
	* hw/kdrive/i810/i810draw.c:
	* hw/kdrive/mach64/mach64draw.c:
	* hw/kdrive/nvidia/nvidiadraw.c:
	* hw/kdrive/smi/smidraw.c:
	* hw/kdrive/src/kaa.c:
	* hw/kdrive/src/kinput.c: (KdMouseAccelerate):
	* include/dixfont.h:
	* include/dixfontstr.h:
	* mi/mi.h:
	* mi/mibstore.c:
	* mi/miglblt.c:
	* mi/mipolytext.c:
	* mi/misprite.c:
	* mi/miwideline.c:
	* miext/damage/damage.c:
	* miext/shadow/shadow.c:
	* miext/shadow/shalloc.c:
	* miext/shadow/shpacked.c:
	* miext/shadow/shplanar.c:
	* miext/shadow/shplanar8.c:
	* miext/shadow/shrotate.c:
	* miext/shadow/shrotpack.h:
	* miext/shadow/shrotpackYX.h:
	* os/xstrans.c:
	* os/xstrans.h:
	Build with modular X.org libraries and headers.

	* composite/compwindow.c
	Don't damage unmoved windows.
	Let border clip reset leave damage alone,
	pending actual damage for painting.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.359
retrieving revision 3.360
diff -u -d -r3.359 -r3.360
--- ChangeLog	5 Aug 2005 09:08:31 -0000	3.359
+++ ChangeLog	8 Aug 2005 06:25:19 -0000	3.360
@@ -1,3 +1,48 @@
+2005-08-07  Keith Packard  <keithp at keithp.com>
+
+	* configure.ac:
+	* dix/dispatch.c:
+	* dix/events.c:
+	* dix/glyphcurs.c:
+	* dix/main.c:
+	* dix/swaprep.c:
+	* dix/xpstubs.c:
+	* fb/fbglyph.c:
+	* hw/kdrive/chips/chipsdraw.c:
+	* hw/kdrive/ephyr/hostx.c: (hostx_screen_init):
+	* hw/kdrive/epson/epson13806draw.c:
+	* hw/kdrive/i810/i810draw.c:
+	* hw/kdrive/mach64/mach64draw.c:
+	* hw/kdrive/nvidia/nvidiadraw.c:
+	* hw/kdrive/smi/smidraw.c:
+	* hw/kdrive/src/kaa.c:
+	* hw/kdrive/src/kinput.c: (KdMouseAccelerate):
+	* include/dixfont.h:
+	* include/dixfontstr.h:
+	* mi/mi.h:
+	* mi/mibstore.c:
+	* mi/miglblt.c:
+	* mi/mipolytext.c:
+	* mi/misprite.c:
+	* mi/miwideline.c:
+	* miext/damage/damage.c:
+	* miext/shadow/shadow.c:
+	* miext/shadow/shalloc.c:
+	* miext/shadow/shpacked.c:
+	* miext/shadow/shplanar.c:
+	* miext/shadow/shplanar8.c:
+	* miext/shadow/shrotate.c:
+	* miext/shadow/shrotpack.h:
+	* miext/shadow/shrotpackYX.h:
+	* os/xstrans.c:
+	* os/xstrans.h:
+	Build with modular X.org libraries and headers.
+
+	* composite/compwindow.c
+	Don't damage unmoved windows.
+	Let border clip reset leave damage alone,
+	pending actual damage for painting.
+	
 2005-08-05  mallum  <mallum at openedhand.com>
 
 	* hw/kdrive/ephyr/ephyr.c: (ephyrInitialize), (ephyrCardInit),

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.103
retrieving revision 3.104
diff -u -d -r3.103 -r3.104
--- configure.ac	12 Jul 2005 09:57:00 -0000	3.103
+++ configure.ac	8 Aug 2005 06:25:19 -0000	3.104
@@ -79,7 +79,8 @@
 # tslib touchscreen driver
 AC_CHECK_HEADERS([tslib.h])
 
-REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau"
+# REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau"
+REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau"
 
 DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
 DEFAULT_VENDOR_STRING="freedesktop.org"
@@ -153,7 +154,7 @@
 AM_CONDITIONAL(COMPOSITE, [test x$COMPOSITE = xyes])
 if test "$COMPOSITE" = yes; then
 	AC_DEFINE(COMPOSITE,1,[Support Composite Extension])
-	REQUIRED_MODULES="$REQUIRED_MODULES compositeext"
+	REQUIRED_MODULES="$REQUIRED_MODULES compositeproto"
 fi
 
 AM_CONDITIONAL(MITSHM, [test x$MITSHM = xyes])
@@ -214,13 +215,13 @@
 AM_CONDITIONAL(RES, [test x$RES = xyes])
 if test "$RES" = yes; then
 	AC_DEFINE(RES,1,[Support X resource extension])
-	REQUIRED_MODULES="$REQUIRED_MODULES resourceext"
+	REQUIRED_MODULES="$REQUIRED_MODULES resourceproto"
 fi
 
 AM_CONDITIONAL(RECORD, [test x$RECORD = xyes])
 if test "$RECORD" = yes; then
 	AC_DEFINE(XRECORD,1,[Support X record extension])
-	REQUIRED_MODULES="$REQUIRED_MODULES recordext"
+	REQUIRED_MODULES="$REQUIRED_MODULES recordproto"
 	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/record'
 	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/record/librecord.a'
 fi
@@ -258,7 +259,7 @@
 if test "$XINERAMA" = yes; then
 	AC_DEFINE(XINERAMA,1,[Support Xinerama extension])
 	AC_DEFINE(PANORAMIX,1,[Internal define for Xinerama])
-	REQUIRED_MODULES="$REQUIRED_MODULES panoramixext"
+	REQUIRED_MODULES="$REQUIRED_MODULES panoramixproto"
 fi
 
 AM_CONDITIONAL(XLOADABLE, [test x$XLOADABLE = xyes])
@@ -504,7 +505,10 @@
         PKG_CHECK_MODULES(XEGLSERVER, $XEGL_REQUIRED_MODULES)
 fi
 
-AC_CHECK_HEADERS([X11/XF86keysym.h],,,${XSERVER_CFLAGS})
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XSERVER_CFLAGS $CFLAGS"
+AC_CHECK_HEADERS([X11/XF86keysym.h],,,)
+CFLAGS="$save_CFLAGS"
 
 XSERVER_CFLAGS="$XSERVER_CFLAGS -D_BSD_SOURCE "'-I${top_srcdir}/include -I${top_srcdir}/Xext'