xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/Makefile.am |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f456f32cd97684052cab4712e7f4c827132c554b
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Aug 13 16:21:28 2008 -0400

    Build fix.

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 98d7ec8..eff2c31 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -4,9 +4,9 @@ if DRI
 DRI_SUBDIR = dri
 endif
 
-if DRI2
-DRI2_SUBDIR = dri2
-endif
+#if DRI2
+#DRI2_SUBDIR = dri2
+#endif
 
 if XF86UTILS
 XF86UTILS_SUBDIR = utils