From 419448ea7b0d7f672e568cb1d8b4e190a1f54825 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Tue, 12 Jul 2005 03:03:16 +0000
Subject: [PATCH] Pull libdri out of the build for now until I get something
 better worked     out

---
 GL/Makefile.am | 7 +------
 configure.ac   | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/GL/Makefile.am b/GL/Makefile.am
index bc2d286e4..dd1ba99ab 100644
--- a/GL/Makefile.am
+++ b/GL/Makefile.am
@@ -1,8 +1,3 @@
 SUBDIRS = glx
 
-if DRI
-SUBDIRS += dri
-endif
-
-# switch among mesa/apple/windows for different ddxes
-
+# xwin/darwin/xfree86 have their accel support under the DDX
diff --git a/configure.ac b/configure.ac
index 0c8e5d416..a395ec8b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -699,7 +699,7 @@ AC_SUBST([libdir exec_prefix prefix])
 AC_OUTPUT([
 Makefile
 GL/Makefile
-GL/dri/Makefile
+GL/glx/Makefile
 include/Makefile
 afb/Makefile
 composite/Makefile