xserver ChangeLog,3.188,3.189 configure.ac,3.79,3.80

[Phil Blundell]

Committed by: pb

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
2004-06-02  Philip Blundell  <philb at gnu.org>

	* configure.ac (XCALIBRATE): New conditional.
	(REQUIRED_MODULES): Demand xcalibrateext if building XCalibrate.
	* Xext/xcalibrate.c: New file.
	* Xext/Makefile.am (libXext_a_SOURCES) [XCALIBRATE=yes]: Add
	xcalibrate.c.
	* hw/kdrive/linux/tslib.c (TsRead): Read raw events if requested.



Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.188
retrieving revision 3.189
diff -u -d -r3.188 -r3.189
--- a/ChangeLog	30 May 2004 20:40:30 -0000	3.188
+++ b/ChangeLog	2 Jun 2004 20:49:49 -0000	3.189
@@ -1,3 +1,12 @@
+2004-06-02  Philip Blundell  <philb at gnu.org>
+
+	* configure.ac (XCALIBRATE): New conditional.
+	(REQUIRED_MODULES): Demand xcalibrateext if building XCalibrate.
+	* Xext/xcalibrate.c: New file.
+	* Xext/Makefile.am (libXext_a_SOURCES) [XCALIBRATE=yes]: Add
+	xcalibrate.c.
+	* hw/kdrive/linux/tslib.c (TsRead): Read raw events if requested.
+
 2004-05-30  Philip Blundell  <philb at gnu.org>
 
 	* hw/kdrive/nvidia/Makefile.am (Xnvidia_LDADD): Add -lts if using

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.79
retrieving revision 3.80
diff -u -d -r3.79 -r3.80
--- a/configure.ac	29 May 2004 12:15:46 -0000	3.79
+++ b/configure.ac	2 Jun 2004 20:49:50 -0000	3.80
@@ -339,7 +339,12 @@
 	EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/composite/libcomposite.a'
 	EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/composite'
 fi
-	
+
+if test "$TSLIB" = yes -a "$KDRIVESERVER" = "yes"; then
+	enable_xcalibrate=yes
+	REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext"
+fi
+AM_CONDITIONAL(XCALIBRATE, [test "$enable_xcalibrate" = "yes"])
 
 DIX_LIB='$(top_builddir)/dix/libdix.a'
 OS_LIB='$(top_builddir)/os/libos.a'