Pull libdri out of the build for now until I get something better worked

    out

diff --git a/GL/Makefile.am b/GL/Makefile.am
index bc2d286..dd1ba99 100644 (file)
--- 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 0c8e5d4..a395ec8 100644 (file)
--- 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