[xserver-commit] xserver ChangeLog,3.143,3.144 configure.ac,3.61,3.62

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
Yes, I know the build was broken. This should fix Xizzle-less builds.

Also, I moved /cvs/xserver/xizzle -> /cvs/xserver/xserver/hw/xizzle.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.143
retrieving revision 3.144
diff -u -d -r3.143 -r3.144
--- a/ChangeLog	7 Mar 2004 12:52:06 -0000	3.143
+++ b/ChangeLog	8 Mar 2004 22:57:51 -0000	3.144
@@ -1,3 +1,10 @@
+2004-03-08  Daniel Stone  <daniel@freedesktop.org>
+	* hw/xizzle:
+	Move this in to actually be a first-class citizen.
+
+	* configure.ac:
+	Fix the build, default to KDrive.
+
 2004-03-07  Daniel Stone  <daniel@freedesktop.org>
 	* hw/xfree86, hw/xizzle:
 	Renaming the XFree86 DDX to 'Xizzle' per Mike Harris's suggestion. There

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.61
retrieving revision 3.62
diff -u -d -r3.61 -r3.62
--- a/configure.ac	7 Mar 2004 12:09:17 -0000	3.61
+++ b/configure.ac	8 Mar 2004 22:57:51 -0000	3.62
@@ -91,10 +91,10 @@
 AC_ARG_ENABLE(composite,     [  --disable-composite ],[COMPOSITE=$enableval],[COMPOSITE=yes])
 AC_ARG_ENABLE(mitshm,        [  --disable-shm ],[MITSHM=$enableval],[MITSHM=yes])
 AC_ARG_ENABLE(xres,          [  --disable-xres ],[RES=$enableval],[RES=yes])
-AC_ARG_ENABLE(kdriveserver,  [  --enable-kdriveserver ],[KDRIVESERVER=$enableval],[KDRIVESERVER=yes])
+AC_ARG_ENABLE(kdriveserver,  [  --disable-kdriveserver ],[KDRIVESERVER=$enableval],[KDRIVESERVER=yes])
 AC_ARG_ENABLE(xnestserver,   [  --enable-xnestserver ],[XNESTSERVER=$enableval],[XNESTSERVER=no])
 AC_ARG_ENABLE(xwinserver,    [  --enable-xwinserver ],[XWINSERVER=$enableval],[XWINSERVER=no])
-AC_ARG_ENABLE(xizzleserver,  [  --disable-xizzleserver ],[XIZZLESERVER=$enableval],[XIZZLESERVER=no])
+AC_ARG_ENABLE(xizzleserver,  [  --enable-xizzleserver ],[XIZZLESERVER=$enableval],[XIZZLESERVER=no])
 AC_ARG_ENABLE(xtrap,         [  --enable-xtrap ],[XTRAP=$enableval],[XTRAP=no])
 AC_ARG_ENABLE(builtinrgb,    [  --disable-builtinrgb ],[USE_RGB_BUILTIN=$enableval],[USE_RGB_BUILTIN=yes])
 AC_ARG_ENABLE(screensaver,   [  --disable-screensaver ],
@@ -106,7 +106,7 @@
 AC_ARG_ENABLE(dri,           [  --enable-dri ],[DRI=$enableval],[DRI=no])
 AC_ARG_ENABLE(xinput,	     [  --enable-xinput ],[XINPUT=$enableval],[XINPUT=no])
 AC_ARG_ENABLE(xloadable,     [  --enable-xloadable ],[XLOADABLE=$enableval],[XLOADABLE=no])
-AC_ARG_ENABLE(xinerama,	     [  --disable-xinerama ],[XINERAMA=$enableval],[XINERAMA=yes])
+AC_ARG_ENABLE(xinerama,	     [  --disable-xinerama ],[XINERAMA=$enableval],[XINERAMA=no])
 
 AC_ARG_WITH(mesa-source,        [  --with-mesa-source=PATH ],
 				[MESA_SOURCE="$withval"],
@@ -161,7 +161,7 @@
 
 AM_CONDITIONAL(XIZZLESERVER, [test x$XIZZLESERVER = xyes])
 if test "$XIZZLESERVER" = yes; then
-	AC_DEFINE(XIZZLESERVER,,[Build XFree86 server])
+	AC_DEFINE(XIZZLESERVER,,[Build Xizzle server])
 	XIZZLE_REQUIRED_MODULES="x11 xext xfont xdmcp"
 fi