[xserver-commit] xserver ChangeLog,3.131,3.132 configure.ac,3.52,3.53

[Jaymz Julian]

Committed by: jaymz

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
change --enable-xres's help to agree with what configure acrtually 
expects. 

I am a normal human worm baby!



Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.131
retrieving revision 3.132
diff -u -d -r3.131 -r3.132
--- ChangeLog	5 Feb 2004 09:09:50 -0000	3.131
+++ ChangeLog	9 Feb 2004 12:45:44 -0000	3.132
@@ -1,3 +1,10 @@
+2004-02-09  Jaymz Julian  <jaymz@artificial-stupidity.net>
+	* configure.ac:
+	* Make --enable-res agree with it's help option (help said
+	--enable-res, but configure accepted --enable-xres.  Changed help to
+	match the command, to avoid breaking people's existing configurations,
+	contrary to Glenn McGrath's patch - but thanks :)
+
 2004-02-05  Jaymz Julian  <jaymz@artificial-stupidity.net>
 	* hw/kdrive/src/kdrive.h:
 	* hw/kdrive/src/kinput.c:

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.52
retrieving revision 3.53
diff -u -d -r3.52 -r3.53
--- configure.ac	25 Jan 2004 05:24:09 -0000	3.52
+++ configure.ac	9 Feb 2004 12:45:44 -0000	3.53
@@ -89,7 +89,7 @@
 AC_ARG_ENABLE(xv,            [  --disable-xv ],[XV=$enableval],[XV=yes])
 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-res ],[RES=$enableval],[RES=yes])
+AC_ARG_ENABLE(xres,          [  --disable-xres ],[RES=$enableval],[RES=yes])
 AC_ARG_ENABLE(kdriveserver,  [  --disable-kdriveserver ],[KDRIVESERVER=$enableval],[KDRIVESERVER=yes])
 AC_ARG_ENABLE(xnestserver,   [  --disable-xnestserver ],[XNESTSERVER=$enableval],[XNESTSERVER=yes])
 AC_ARG_ENABLE(xwinserver,    [  --enable-xwinserver ],[XWINSERVER=$enableval],[XWINSERVER=no])