Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/Imakefile,v
retrieving revision 1.6
diff -u -r1.6 Imakefile
--- Imakefile	27 Aug 2004 22:47:45 -0000	1.6
+++ Imakefile	29 Aug 2004 15:11:34 -0000
@@ -50,7 +50,7 @@
 REQUIREDI18NLIBS = DlLibrary
 #endif
 
-REQUIREDLIBS=$(REQUIREDX11LIBS) $(REQUIREDI18NLIBS)
+REQUIREDLIBS=$(XDMAUTHLIBS) $(REQUIREDX11LIBS) $(REQUIREDI18NLIBS)
 
 #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
 XBSDLIB = /**/
@@ -63,9 +63,13 @@
 #endif
 #if HasXdmAuth
         XDMAUTHDEFS = -DHASXDMAUTH
+#ifdef cygwinArchitecture
+        XDMAUTHLIBS = -L$(BUILDLIBDIR) -lXdmcp
+#else
         XDMAUTHOBJS = Wrap.o Wraphelp.o
         XDMAUTHSRCS = Wrap.c Wraphelp.c
 #endif
+#endif
 #if BuildXKBlib
     XKB_DEFINES = -DXKB 
         XKBSRCS = XKB.c XKBBind.c XKBCompat.c XKBCtrls.c XKBCvt.c XKBGetMap.c \
@@ -1060,10 +1064,12 @@
 LinkSourceFile(k5encode.c,$(XAUTHSRC))
 #endif
 #if HasXdmAuth
+#ifndef cygwinArchitecture
 LinkSourceFile(Wrap.h,$(XDMCPLIBSRC))
 LinkSourceFile(Wrap.c,$(XDMCPLIBSRC))
 LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC))
 #endif
+#endif
 
 #ifdef QNX4Architecture
 LOCAL_LDFLAGS=-F