[xserver-commit] xserver/os Makefile.am,3.6,3.7 xdmcp.c,3.24,3.25

[Phil Blundell]

Committed by: pb

Update of /cvs/xserver/xserver/os
In directory pdx:/tmp/cvs-serv24375/os

Modified Files:
	Makefile.am xdmcp.c 
Log Message:
add --enable-xdmcp.



Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/os/Makefile.am,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- Makefile.am	1 Oct 2003 06:43:50 -0000	3.6
+++ Makefile.am	30 Oct 2003 23:41:46 -0000	3.7
@@ -7,11 +7,14 @@
 
 #	k5auth.c	\
 #	lbxio.c		\
-#	xdmcp.c		\
 #	rpcauth.c	\
 #	genalloca.c	\
 #	secauth.c
 
+if XDMCP
+XDMCP_SOURCES = xdmcp.c
+endif
+
 libos_a_SOURCES = 	\
 	WaitFor.c	\
 	access.c	\
@@ -25,4 +28,5 @@
 	utils.c		\
 	xdmauth.c	\
 	xstrans.c	\
-	xalloc.c
+	xalloc.c	\
+	$(XDMCP_SOURCES)

Index: xdmcp.c
===================================================================
RCS file: /cvs/xserver/xserver/os/xdmcp.c,v
retrieving revision 3.24
retrieving revision 3.25
diff -u -d -r3.24 -r3.25
--- xdmcp.c	11 Sep 2003 05:12:51 -0000	3.24
+++ xdmcp.c	30 Oct 2003 23:41:46 -0000	3.25
@@ -32,7 +32,7 @@
 #undef RT_CURSOR
 #endif
 
-#include "Xos.h"
+#include <X11/Xos.h>
 
 #if !defined(WIN32)
 #ifndef Lynx
@@ -47,9 +47,9 @@
 
 #include <stdio.h>
 #include <X11/X.h>
-#include "Xmd.h"
+#include <X11/Xmd.h>
 #include "misc.h"
-#include "Xpoll.h"
+#include <X11/Xpoll.h>
 #include "osdep.h"
 #include "input.h"
 #include "dixstruct.h"