[xlibs-commit] X11 ChangeLog,1.20,1.21 configure.ac,1.21,1.22

[Jamey Sharp]

Committed by: jamey

Update of /cvs/xlibs/X11
In directory pdx:/tmp/cvs-serv32471

Modified Files:
	ChangeLog configure.ac 
Log Message:
A better-tested version of XCL is now available as a configure-time option.
Unlike the version that was on the XCL branch, this removes no code from CVS;
but when --with-xcb is given to configure, the old code is simply not compiled.
The new code is isolated in the xcl subdirectory.

Note that this version of XCL requires the XCB version with the pre_sendrequest
tag. Versions newer than that have API changes that XCL needs to track, but I
wanted to commit the conditional compile patches first.


Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/X11/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ChangeLog	17 Nov 2003 21:50:52 -0000	1.20
+++ ChangeLog	28 Nov 2003 10:49:43 -0000	1.21
@@ -1,9 +1,35 @@
+2003-11-28  Jamey Sharp  <jamey@minilop.net>
+
+	* configure.ac:
+	* include/X11/Xlibint.h:
+	* src/ClDisplay.c:
+	* src/Makefile.am:
+	* src/OpenDis.c:
+	* src/Xintconn.h:
+	* src/XlibInt.c:
+	* src/xclint.h (new):
+	* src/xcl/display.c (new):
+	* src/xcl/io.c (new):
+	A better-tested version of XCL is now available as a
+	configure-time option. Unlike the version that was on the XCL
+	branch, this removes no code from CVS; but when --with-xcb is
+	given to configure, the old code is simply not compiled. The new
+	code is isolated in the xcl subdirectory.
+
+	Note that this version of XCL requires the XCB version with the
+	pre_sendrequest tag. Versions newer than that have API changes
+	that XCL needs to track, but I wanted to commit the conditional
+	compile patches first.
+
+	Note that XCL removes libXdmcp, which kdm on Debian - at
+	least - assumes is linked into Xlib. I worked around this with
+	the obvious LD_PRELOAD.
+
 2003-11-13  Matthew Allum  <mallum@openedhand.com>
 
-	* src/X18NCMSstubs.c 
+	* src/X18NCMSstubs.c:
 	Extra stubs for _XlcCurrentLC, _XimGetLocaleCode. see bug #143
 
-
 2003-11-13  Jamey Sharp  <jamey@minilop.net>
 
 	* configure.ac:

Index: configure.ac
===================================================================
RCS file: /cvs/xlibs/X11/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure.ac	13 Nov 2003 19:05:26 -0000	1.21
+++ configure.ac	28 Nov 2003 10:49:43 -0000	1.22
@@ -19,16 +19,32 @@
 AC_PROG_LIBTOOL
 AC_PROG_CC
 
+# Build XCL? or traditional Xlib?
+AC_ARG_WITH(xcb,
+	AC_HELP_STRING([--with-xcb], [use XCB for low-level protocol implementation]),
+	[ac_cv_use_xcb=$withval], [ac_cv_use_xcb=no])
+AC_CACHE_CHECK([whether to use XCB], [ac_cv_use_xcb], [ac_cv_use_xcb=no])
+AM_CONDITIONAL(XCB, test x$ac_cv_use_xcb != xno)
+
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XPROTO, xproto)
 AC_SUBST(XPROTO_CFLAGS)
 AC_SUBST(XPROTO_LIBS)
 
-PKG_CHECK_MODULES(X11, xextensions xtrans xau)
+case "$ac_cv_use_xcb" in
+no)
+	PKG_CHECK_MODULES(X11, xextensions xtrans xau)
+	PKG_CHECK_MODULES(XDMCP, xdmcp, [xdmauth="yes"], [xdmauth="no"])
+	AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])
+	;;
+*)
+	PKG_CHECK_MODULES(X11, xextensions xtrans xcb)
+	AC_DEFINE(USE_XCB, 1, [Use XCB for low-level protocol implementation])
+	;;
+esac
+
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
-
-PKG_CHECK_MODULES(XDMCP, xdmcp, [xdmauth="yes"], [xdmauth="no"])
 AC_SUBST(XDMCP_CFLAGS)
 AC_SUBST(XDMCP_LIBS)