[xlibs-commit] X11 ChangeLog,1.19,1.19.2.1 configure.ac,1.21,1.21.2.1

[Jamey Sharp]

Committed by: jamey

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

Modified Files:
      Tag: XCL
	ChangeLog configure.ac 
Log Message:
Landed XCL patches on the XCL branch. Removed a ton of code, replacing
it with calls into XCB. Tested on a variety of applications, window
managers, and display managers. Another patch to make it run on Solaris
will land soon; I haven't tested it much yet.

Note that this removes libXdmcp, which kdm on Debian - at least -
assumes is linked into Xlib. I worked around this with the obvious
LD_PRELOAD.


Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/X11/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- ChangeLog	13 Nov 2003 19:05:26 -0000	1.19
+++ ChangeLog	13 Nov 2003 19:28:34 -0000	1.19.2.1
@@ -3,6 +3,27 @@
 	* configure.ac:
 	Fix path for finding keysymdef.h.
 
+	* configure.ac:
+	* include/X11/Xlibint.h:
+	* src/Makefile.am:
+	* src/OpenDis.c:
+	* src/XlibInt.c:
+	* src/xclint.h (new):
+	* src/ClDisplay.c (removed):
+	* src/ConnDis.c (removed):
+	* src/Xintconn.h (removed):
+	* src/x11_trans.c (removed):
+	* src/x11_trans.h (removed):
+	Landed XCL patches on the XCL branch. Removed a ton of code,
+	replacing it with calls into XCB. Tested on a variety of
+	applications, window managers, and display managers. Another
+	patch to make it run on Solaris will land soon; I haven't tested
+	it much yet.
+
+	Note that this removes libXdmcp, which kdm on Debian - at
+	least - assumes is linked into Xlib. I worked around this with
+	the obvious LD_PRELOAD.
+
 2003-11-09  Eric Anholt  <anholt@FreeBSD.org>
 
 	* configure.ac:

Index: configure.ac
===================================================================
RCS file: /cvs/xlibs/X11/configure.ac,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- configure.ac	13 Nov 2003 19:05:26 -0000	1.21
+++ configure.ac	13 Nov 2003 19:28:34 -0000	1.21.2.1
@@ -24,14 +24,10 @@
 AC_SUBST(XPROTO_CFLAGS)
 AC_SUBST(XPROTO_LIBS)
 
-PKG_CHECK_MODULES(X11, xextensions xtrans xau)
+PKG_CHECK_MODULES(X11, xcb xextensions xtrans)
 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)
-
 # Check for dlopen
 AC_SEARCH_LIBS(dlopen,[dl svld])
 if test x$ac_cv_search_dlopen = xno; then
@@ -85,22 +81,6 @@
 AC_SUBST(XTHREADS_CFLAGS)
 AC_SUBST(XTHREADS_LIBS)
 
-if test "x$xdmauth" = "xyes"; then
-AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS])
-fi
-
-case x$xdmauth in
-xyes)
-	XDMCP_CFLAGS="$XDMCP_CFLAGS -DHASXDMAUTH"
-	;;
-xno)
-	XDMCP_CFLAGS=""
-	XDMCP_LIBS=""
-	;;
-esac
-AC_SUBST(XDMCP_CFLAGS)
-AC_SUBST(XDMCP_LIBS)
-
 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
 
 #