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

[Jeremy Huddleston]

 hw/xquartz/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7711c56dd63dda7319e29f4985bed6ae8a970fd4
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Nov 22 14:06:50 2008 -0800

    XQuartz: Fixed --disable-glx

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index f9d7823..d1eb283 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -13,9 +13,9 @@ if GLX
 GL_DIR = GL
 endif
 
-SUBDIRS = bundle . GL xpr pbproxy mach-startup doc
+SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup doc
 
-DIST_SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup doc
+DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup doc
 
 libXquartz_la_SOURCES = \
 	$(top_srcdir)/fb/fbcmap_mi.c \