xserver: Branch 'master'

[Ben Byer]

 hw/darwin/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree eb82b19aa71333b46e927516cc228f25d3e05e4d (from 5b08932bfbb7e4612733fffd2acc9682c6856d90)
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Thu Sep 20 19:55:48 2007 -0700

    XDarwin: build fix for X11.app

diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 72bee4a..71b9767 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -274,7 +274,7 @@ endif
 install-data-hook: $(XQUARTZ_HOOK) $(XDARWINAPP_HOOK)
 
 xquartz-install-hook::
-	cd apple && xcodebuild install
+	cd apple && xcodebuild install CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)"
 
 xdarwinapp-install hook:
 	mv $(DESTDIR)$(macosdir)/XDarwinApp $(DESTDIR)$(macosdir)/XDarwin