[PATCH] All patches needed to make XFree86 source tree build on Cygwin

[Harold Hunt]

Suhaib,

These are the only patches that need to be made to the XFree86 source tree
to fix compilation on Cygwin.

The first patch removes a #include for a header that doesn't exist.  The
second patch removes the ntux_xf files from the XWin.exe build.  The third
patch makes a few changes to the Xserver Imakefile to actually build XWin;
the XWin directory wasn't being included in the list of directories to
build, and more references to ntux_xf were removed.  The fourth patch makes
sure that make doesn't bomb when it tries to move imake. 

Index: glheader.h
===================================================================
RCS file: /cvs/xc/extras/Mesa/src/glheader.h,v
retrieving revision 1.9
diff -r1.9 glheader.h
162c162
< #include <gl/mesa_wgl.h>
---
> /*#include <gl/mesa_wgl.h>*/

Index: Imakefile
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xwin/Imakefile,v
retrieving revision 1.1
diff -r1.1 Imakefile
21c21
< SRCSA =       InitInput.c InitOutput.c stubs.c miinitext.c directx.c
ntux_xf.c

---
> SRCSA =       InitInput.c InitOutput.c stubs.c miinitext.c directx.c
23c23
< OBJSA =       InitInput.o InitOutput.o stubs.o miinitext.o directx.o
ntux_xf.o

---
> OBJSA =       InitInput.o InitOutput.o stubs.o miinitext.o directx.o

Index: Imakefile
===================================================================
RCS file: /cvs/xc/programs/Xserver/Imakefile,v
retrieving revision 3.197
diff -r3.197 Imakefile
1069c1069
< #if XWinServer && !MakeDllModules
---
> #if XWinServer
1078d1077
< #ifndef Win32Architecture
1080,1082d1078
< #else
< XWINDDXDIR = hw
< #endif
1085c1081
< XWINOBJS = hw/xwin/InitInput.o hw/xwin/InitOutput.o hw/xwin/stubs.o
hw/xwin/di
rectx.o hw/xwin/dpmsstubs.o dix/main.o hw/xwin/ntux_xf.o
---
> XWINOBJS = hw/xwin/InitInput.o hw/xwin/InitOutput.o hw/xwin/stubs.o
hw/xwin/di
rectx.o hw/xwin/dpmsstubs.o dix/main.o
1087c1083
< XWINOBJS = hw/xwin/InitInput.o hw/xwin/InitOutput.o hw/xwin/stubs.o
hw/xwin/di
rectx.o dix/main.o hw/xwin/ntux_xf.o
---
> XWINOBJS = hw/xwin/InitInput.o hw/xwin/InitOutput.o hw/xwin/stubs.o
hw/xwin/di
rectx.o dix/main.o
1111c1107,1108
< DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR)
---
> DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR) \
>         $(XWINDDXDIR)

Index: Makefile.ini
===================================================================
RCS file: /cvs/xc/config/imake/Makefile.ini,v
retrieving revision 3.8
diff -r3.8 Makefile.ini
43,44c43
<       @if [ -f imake ]; then set -x; $(MV) imake bootstrap; else exit 0;
fi
<       @if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; else
exit
0; fi
---
>       @if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; elif [
-f
imake ]; then set -x; $(MV) imake bootstrap; else exit 0; fi

Harold