summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-07-12 03:03:16 +0000
committerAdam Jackson <ajax@nwnk.net>2005-07-12 03:03:16 +0000
commit419448ea7b0d7f672e568cb1d8b4e190a1f54825 (patch)
tree737402311a13b32ab7dd466c07f2cd8dce339045
parentf054bf2ff6b94e285e7f2d174163c01b07b07143 (diff)
Pull libdri out of the build for now until I get something better worked
out
-rw-r--r--GL/Makefile.am7
-rw-r--r--configure.ac2
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