xserver ChangeLog,3.160,3.161 configure.ac,3.70,3.71

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver
In directory pdx:/tmp/cvs-serv17025

Modified Files:
	ChangeLog configure.ac 
Log Message:
Xizzle is dead, long live Xorg.

Re-import the DDX from X11R6.7, complete with automakey goodness, and do the
requisite configure.ac, et al, updates; also import the XKB extension from the
6.7 DIX.

Currently it'll link and then hang solid in RADEONInitAccel(), or the next
function if you enable NoAccel.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.160
retrieving revision 3.161
diff -u -d -r3.160 -r3.161
--- a/ChangeLog	25 Apr 2004 10:25:39 -0000	3.160
+++ b/ChangeLog	25 Apr 2004 13:52:08 -0000	3.161
@@ -11,8 +11,13 @@
 	* Xi/Makefile.am:
 	* Xi/*.c:
 	* xkb:
+	* os/utils.c:
+	* os/log.c:
 	Some XFree86 extensions added and/or fixed, including XKB and Xi (both
 	needed for an Xorg build).
+	Log stuff resolved by building log-based functions with XFree86Server,
+	but non-log-based stuff without. Unfortunately, this and other
+	conflicts mean that the DIX can't be built for both KDrive and Xorg.
 
 2004-04-20  Daniel Stone  <daniel at freedesktop.org>
 	

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.70
retrieving revision 3.71
diff -u -d -r3.70 -r3.71
--- a/configure.ac	25 Apr 2004 10:25:39 -0000	3.70
+++ b/configure.ac	25 Apr 2004 13:52:08 -0000	3.71
@@ -438,7 +438,7 @@
 	           $SHADOW_INC $FB_INC $XSERVER_CFLAGS $XI_INC"
 	XORG_CFLAGS="$XORGSERVER_CFLAGS -D_XOPEN_SOURCE -D_POSIX_SOURCE=500 \
 	             -D_BSD_SOURCE -Wall -DNEED_XF86_TYPES
-	             -DNEED_XF86_PROTOTYPES"
+	             -DNEED_XF86_PROTOTYPES -DXFree86Server"
 	case $host_os in
 	  linux-gnu*)
 	  	# support: yea