xserver: Branch 'master'

[Adam Jackson]

 configure.ac |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c1e9b7dc6f4600fe6c301aecd7d67461cb884df0
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Aug 13 14:13:55 2008 -0400

    Sledgehammer off the DRI2 build system.

diff --git a/configure.ac b/configure.ac
index 5155dbd..c902773 100644
--- a/configure.ac
+++ b/configure.ac
@@ -856,13 +856,13 @@ if test "x$DRI" = xyes; then
 	AC_SUBST(GL_CFLAGS)
 fi
 
-AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
-if test "x$DRI2" = xyes; then
-	# FIXME: Bump the versions once we have releases of these.
-	AC_DEFINE(DRI2, 1, [Build DRI2 extension])
-	PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= 1.1])
-	PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.2])
-fi
+#AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
+#if test "x$DRI2" = xyes; then
+#	# FIXME: Bump the versions once we have releases of these.
+#	AC_DEFINE(DRI2, 1, [Build DRI2 extension])
+#	PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= 1.1])
+#	PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.2])
+#fi
 
 AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
 if test "x$XINERAMA" = xyes; then