xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/darwin/darwin.h               |    3 ++-
 hw/darwin/launcher/Makefile.am   |    2 +-
 hw/darwin/quartz/xpr/Makefile.am |   16 ++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit b8ccca70ffc9a96332a56724ebcdb78b8c73e1a9
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Mon Nov 26 14:29:07 2007 -0800

    Darwin: Workaround weird crash in keyboard events
    Somehow including dix-config.h in darwin.h is crashing us... just defining
    SHAPE as a workaround for now.

diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h
index a8c670b..e85013d 100644
--- a/hw/darwin/darwin.h
+++ b/hw/darwin/darwin.h
@@ -27,7 +27,8 @@
 #ifndef _DARWIN_H
 #define _DARWIN_H
 
-#include "dix-config.h"
+// #include "dix-config.h" // This makes us crash for some reason...
+#define SHAPE
 
 #include <IOKit/IOTypes.h>
 #include "inputstr.h"
diff --git a/hw/darwin/launcher/Makefile.am b/hw/darwin/launcher/Makefile.am
index f2d9ede..c291731 100644
--- a/hw/darwin/launcher/Makefile.am
+++ b/hw/darwin/launcher/Makefile.am
@@ -6,7 +6,7 @@ x11launcher:
 	xcodebuild CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ARCHS="$(X11APP_ARCHS)"
 
 install-data-hook:
-	cd launcher && xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(APPLE_APPLICATIONS_DIR) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
+	xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(APPLE_APPLICATIONS_DIR) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
 
 clean-local:
 	rm -rf build
diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/darwin/quartz/xpr/Makefile.am
index f610f73..8f482f1 100644
--- a/hw/darwin/quartz/xpr/Makefile.am
+++ b/hw/darwin/quartz/xpr/Makefile.am
@@ -9,14 +9,14 @@ AM_CPPFLAGS = \
 
 libxpr_a_SOURCES = \
 	appledri.c \
-        dri.c \
-        xprAppleWM.c \
-        xprCursor.c \
-        xprFrame.c \
-        xprScreen.c \
-        x-hash.c \
-        x-hook.c \
-        x-list.c
+	dri.c \
+	xprAppleWM.c \
+	xprCursor.c \
+	xprFrame.c \
+	xprScreen.c \
+	x-hash.c \
+	x-hook.c \
+	x-list.c
 
 EXTRA_DIST = \
 	dri.h \