xserver: Branch 'master'

[Julien Cristau]

 configure.ac            |    3 ---
 include/dix-config.h.in |    3 ---
 2 files changed, 6 deletions(-)

New commits:
commit 1e4412abc499b9938bbac8a3ecd82f7f12d448d9
Author: Rémi Cardona <remi.cardona at lri.fr>
Date:   Mon Nov 17 09:56:49 2008 +0100

    drop unused HAVE_LIBDRM_2_2
    
    Signed-off-by: Julien Cristau <jcristau at debian.org>

diff --git a/configure.ac b/configure.ac
index 048416f..9f5bbd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -861,9 +861,6 @@ AM_CONDITIONAL(DRI2, test "x$DRI2" == xyes)
 
 if test "x$DRI" = xyes || test "x$DRI2" = xyes; then
 	PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0])
-	PKG_CHECK_EXISTS(libdrm >= 2.2.0,
-			 [AC_DEFINE([HAVE_LIBDRM_2_2], 1,
-			 [Has version 2.2 (or newer) of the drm library])])
 	AC_SUBST(LIBDRM_CFLAGS)
 	AC_SUBST(LIBDRM_LIBS)
 fi
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 5739a05..65b5950 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -121,9 +121,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have version 2.2 (or newer) of the drm library */
-#undef HAVE_LIBDRM_2_2
-
 /* Have Quartz */
 #undef XQUARTZ