More build fixes / updates for XDarwin:

quartz/cr: "Cocoa Rootless" support (deprecated in favor of xpr?)
   quartz/fullscreen: Fullscreen support using Xplugin (not yet functional)

hw/darwin/quartz/cr/Makefile.am

@@ -0,0 +1,20 @@
+noinst_LIBRARIES = libcr.a
+AM_CFLAGS =  @XORG_CFLAGS@ @DIX_CFLAGS@
+AM_OBJCFLAGS =  @XORG_CFLAGS@ @DIX_CFLAGS@
+DEFS = @DEFS@ -DDEFER_NSWINDOW
+INCLUDES = @XORG_INCS@ \
+	   -I../fullscreen \
+	   -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
+	   -I$(top_srcdir)/miext/rootless \
+	   -I$(top_srcdir)/miext/rootless/safeAlpha \
+	   -I$(top_srcdir)/mi
+
+libcr_a_SOURCES = crAppleWM.m \
+	           crFrame.m \
+	           crScreen.m \
+	           ../fullscreen/quartzCursor.c \
+	           XView.m
+
+EXTRA_DIST = \
+	cr.h \
+	XView.h 

hw/darwin/quartz/cr/XView.m

@@ -30,7 +30,9 @@
  * use or other dealings in this Software without prior written authorization.
  */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.1 2003/06/07 05:49:07 torrey Exp $ */
-
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
 #import "XView.h"
 
 

hw/darwin/quartz/cr/crAppleWM.m

@@ -27,16 +27,18 @@
  * use or other dealings in this Software without prior written authorization.
  */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
-
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
 #include "quartzCommon.h"
 #include "cr.h"
 
 #undef BOOL
 #define BOOL xBOOL
 #include "rootless.h"
-#include "X.h"
+#include "X11/X.h"
 #define _APPLEWM_SERVER_
-#include "applewm.h"
+#include "X11/extensions/applewm.h"
 #include "applewmExt.h"
 #undef BOOL
 

hw/darwin/quartz/cr/crFrame.m

@@ -29,7 +29,9 @@
  */
 /* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.2 2004/04/23 19:15:51 eich Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.9 2004/03/19 02:05:29 torrey Exp $ */
-
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
 #include "quartzCommon.h"
 #include "cr.h"
 

hw/darwin/quartz/cr/crScreen.m

@@ -29,7 +29,9 @@
  * use or other dealings in this Software without prior written authorization.
  */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.5 2003/11/12 20:21:52 torrey Exp $ */
-
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
 #include "quartzCommon.h"
 #include "cr.h"
 

hw/darwin/quartz/fullscreen/Makefile.am

@@ -0,0 +1,9 @@
+noinst_LIBRARIES = libfullscreen.a
+AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
+INCLUDES = @XORG_INCS@ -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. 
+
+libfullscreen_a_SOURCES = fullscreen.c \
+			   quartzCursor.c
+
+EXTRA_DIST = \
+	quartzCursor.h

hw/darwin/quartz/fullscreen/fullscreen.c

@@ -25,7 +25,9 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-
+ #ifdef HAVE_XORG_CONFIG_H
+ #include <xorg-config.h>
+ #endif
 #include "quartzCommon.h"
 #include "darwin.h"
 #include "quartz.h"

hw/darwin/quartz/fullscreen/quartzCursor.c

@@ -29,7 +29,9 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
 #include "quartzCommon.h"
 #include "quartzCursor.h"
 #include "darwin.h"