xserver ChangeLog,3.189,3.190 configure.ac,3.80,3.81

[Phil Blundell]

Committed by: pb

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

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

	* configure.ac: Allow building without XCalibrate.
	* mi/miinitext.c (InitExtensions) [HAVE_XCALIBRATE]: Call
	XCalibrateExtensionInit.



Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.189
retrieving revision 3.190
diff -u -d -r3.189 -r3.190
--- a/ChangeLog	2 Jun 2004 20:49:49 -0000	3.189
+++ b/ChangeLog	2 Jun 2004 21:22:21 -0000	3.190
@@ -1,5 +1,11 @@
 2004-06-02  Philip Blundell  <philb at gnu.org>
 
+	* configure.ac: Allow building without XCalibrate.
+	* mi/miinitext.c (InitExtensions) [HAVE_XCALIBRATE]: Call
+	XCalibrateExtensionInit.
+
+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.

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.80
retrieving revision 3.81
diff -u -d -r3.80 -r3.81
--- a/configure.ac	2 Jun 2004 20:49:50 -0000	3.80
+++ b/configure.ac	2 Jun 2004 21:22:21 -0000	3.81
@@ -341,8 +341,11 @@
 fi
 
 if test "$TSLIB" = yes -a "$KDRIVESERVER" = "yes"; then
-	enable_xcalibrate=yes
-	REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext"
+	PKG_CHECK_MODULES(XCALIBRATE, xcalibrateext, [enable_xcalibrate="yes"], [enable_xcalibrate="no"])
+	if test "$enable_xcalibrate" = "yes"; then
+		REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext"
+		AC_DEFINE(HAVE_XCALIBRATE,1,[Enable XCalibrate extension])
+	fi
 fi
 AM_CONDITIONAL(XCALIBRATE, [test "$enable_xcalibrate" = "yes"])