xserver: Branch 'server-1.5-branch'

[Adam Jackson]

 hw/xfree86/common/xf86Config.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9ab88bb9b196fdf534f458cce45eb5f301e545e6
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jul 1 12:01:56 2008 -0400

    Don't try to load DRI2 if built without it.
    (cherry picked from commit e2bbf2d248a2d2a2db4adfe9d1bda94cf184d8bd)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 8e412b5..5631aa6 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -123,7 +123,9 @@ static ModuleDefault ModuleDefaults[] = {
     {.name = "record",   .toLoad = TRUE,    .load_opt=NULL},
 #endif
     {.name = "dri",      .toLoad = TRUE,    .load_opt=NULL},
+#ifdef DRI2
     {.name = "dri2",     .toLoad = TRUE,    .load_opt=NULL},
+#endif
     {.name = NULL,       .toLoad = FALSE,   .load_opt=NULL}
 };