xserver: Branch 'master'

[Dan Nicholson]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d6b8d9eaffaf3f976db330bc35da3d30eb656bac
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Fri Jun 27 17:16:35 2008 -0700

    DRI: Ensure we have the DRI headers from Mesa
    
    Change the DRI configure check to look for the dri pkg-config file. This
    prevents people who built an Xlib libGL from bombing later in the build.

diff --git a/configure.ac b/configure.ac
index 6b2f6ac..8abc9a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -867,7 +867,7 @@ if test "x$DRI" = xyes; then
 	AC_DEFINE(XF86DRI, 1, [Build DRI extension])
 	PKG_CHECK_MODULES([DRIPROTO], [xf86driproto])
 	PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0])
-	PKG_CHECK_MODULES([GL], [glproto >= 1.4.1 gl >= 7.1.0])
+	PKG_CHECK_MODULES([GL], [glproto >= 1.4.1 dri >= 7.1.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])])