xserver: Branch 'master'

[Jeremy Huddleston]

 hw/xquartz/mach-startup/Makefile.am |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1885582444fb06da73dea1f118a777bea26e1dc1
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Aug 29 21:18:26 2008 -0700

    XQuartz: Placate automake which doesn't like escaped newlines even in comments...
    (cherry picked from commit 73db1170129a31ad2d55a7e83ac6dfc8030e47f1)

diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index 9b2619d..c5df790 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -21,6 +21,9 @@ X11_LDADD = \
 	$(top_builddir)/miext/rootless/librootless.la \
 	$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin -lX11
 
+#	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \
+#	$(top_builddir)/glx/libglx.la
+
 X11_LDFLAGS =  \
 	-XCClinker -Objc \
 	-Wl,-u,_miDCInitialize \