xserver: Branch 'master' - 2 commits

[Ben Byer]

 hw/darwin/Makefile.am |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree ff01e44e33fd072958fb0157dae072f1b1c88944 (from parents)
Merge: 8ba8c16af773ec83a0b1c0661a23d746b401944e 47300ed2be59d0ba7ea9345b954bf3104877c095
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Wed Sep 5 13:56:08 2007 -0700

    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/xserver

diff-tree 8ba8c16af773ec83a0b1c0661a23d746b401944e (from 28e48cd8e6e4c412a49d7177daad6d3c93c28e08)
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Wed Sep 5 13:46:30 2007 -0700

    build fixes for XDarwin

diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 00811e7..4cec3b1 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -90,6 +90,7 @@ Xquartz_LDFLAGS =  \
                  -Wl,-u,_miDCInitialize \
                  -Wl,-framework,Carbon \
                  -Wl,-framework,OpenGL \
+		 -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib \
                  -Wl,-framework,Cocoa \
                  -Wl,-framework,CoreAudio \
                  -Wl,-framework,IOKit
@@ -115,7 +116,6 @@ XDarwinApp_SOURCES = \
 
 XDARWINAPP_LIBS = \
 	$(DARWIN_LIBS) \
-	$(top_builddir)/dix/dixfonts.lo \
 	./quartz/XApplication.o \
 	./libdarwinShared.a \
 	./quartz/libXQuartz.a \
@@ -152,6 +152,7 @@ cr_la_LIBADD = \
 		$(top_builddir)/miext/rootless/accel/librlAccel.la
 
 cr_la_LDFLAGS = -shrext '' -Wl,-framework,ApplicationServices \
+		-lpixman-1 \
 		-Wl,-framework,Cocoa \
 		-Wl,-framework,Carbon \
 		-XCClinker -ObjC \
@@ -211,6 +212,7 @@ xpr_la_LIBADD = \
 		$(top_builddir)/miext/rootless/accel/librlAccel.la
 
 xpr_la_LDFLAGS = -shrext '' -Wl,-framework,ApplicationServices \
+		-lpixman-1 \
 		-lXplugin \
 		-XCClinker -bundle_loader -XCClinker XDarwinApp \
 		-module -avoid-version -no-undefined