xserver ChangeLog,3.223,3.224 configure.ac,3.88,3.89

[Phil Blundell]

Committed by: pb

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
2004-07-27  Phil Blundell  <pb at nexus.co.uk>

	* configure.ac: Don't require xkbfile if xkb not enabled.



Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.223
retrieving revision 3.224
diff -u -d -r3.223 -r3.224
--- ChangeLog	26 Jul 2004 03:03:41 -0000	3.223
+++ ChangeLog	26 Jul 2004 23:31:30 -0000	3.224
@@ -1,3 +1,7 @@
+2004-07-27  Phil Blundell  <pb at nexus.co.uk>
+
+	* configure.ac: Don't require xkbfile if xkb not enabled.
+
 2004-07-25  Carl Worth  <cworth at isi.edu>
 
 	* hw: Add .deps, Makefile, and Makefile.in to .cvsignore files.

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.88
retrieving revision 3.89
diff -u -d -r3.88 -r3.89
--- configure.ac	19 Jul 2004 17:25:52 -0000	3.88
+++ configure.ac	26 Jul 2004 23:31:30 -0000	3.89
@@ -163,7 +163,6 @@
 if test "$KDRIVESERVER" = yes; then
 	AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
 	AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
-	REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
 fi
 
 AM_CONDITIONAL(XNESTSERVER, [test x$XNESTSERVER = xyes])
@@ -189,7 +188,6 @@
 	AC_DEFINE(XKB,,[Build Xkb])
 	AC_DEFINE(XINPUT,,[Build XInput])
 	AC_DEFINE(XF86DDXACTIONS,,[Build Xorg ddx])
-	REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
 fi
 #AC_SUBST([XKB])