DDX changes for XDarwin

Creating a real DDX section for XDarwin instead of
stuffing it into the XORG section in a half-assed manner.

hw/Makefile.am

@@ -1,5 +1,5 @@
 if DMX
-if BUILD_DARWIN
+if XDARWIN
 # Darwin does not need the dmx subdir
 else
 DMX_SUBDIRS = dmx
@@ -7,12 +7,8 @@ endif
 endif
 
 if XORG
-if BUILD_DARWIN
-# Darwin does not need the xfree86 subdir
-else
 XORG_SUBDIRS = xfree86
 endif
-endif
 
 if XVFB
 XVFB_SUBDIRS = vfb
@@ -38,15 +34,15 @@ if XPRINT
 XPRINT_SUBDIRS = xprint
 endif
 
-if BUILD_DARWIN
-DARWIN_SUBDIRS = darwin
+if XDARWIN
+XDARWIN_SUBDIRS = darwin
 endif
 
 SUBDIRS =			\
 	$(XORG_SUBDIRS)		\
 	$(XGL_SUBDIRS)		\
 	$(XWIN_SUBDIRS)		\
-	$(DARWIN_SUBDIRS)	\
+	$(XDARWIN_SUBDIRS)	\
 	$(XVFB_SUBDIRS)		\
 	$(XNEST_SUBDIRS)	\
 	$(DMX_SUBDIRS)          \

hw/darwin/Makefile.am

@@ -191,7 +191,7 @@ glxMesa_la_DEPENDENCIES = XDarwinApp
 endif
 
 endif
-if HAVE_X_PLUGIN
+if HAVE_XPLUGIN
 
 xprplugindir = $(darwinappdir)/Contents/Resources/xpr.bundle/Contents/MacOS
 xprplugin_LTLIBRARIES = xpr.la

hw/darwin/quartz/Makefile.am

@@ -5,7 +5,7 @@ AM_OBJCFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
 
 INCLUDES = -I$(srcdir) -I$(srcdir)/.. @XORG_INCS@
 AM_DEFS = -DHAS_CG_MACH_PORT -DHAS_KL_API
-if HAVE_X_PLUGIN
+if HAVE_XPLUGIN
 AM_DEFS += -DBUILD_XPR
 endif
 DEFS = @DEFS@ $(AM_DEFS) -DXBINDIR=\"${bindir}\"