xserver: Branch 'master'

[Keith Packard]

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

New commits:
diff-tree 27ffd7e03c05dd2083a10e5acebd2b385d729eeb (from d7a96dd6f18e54c26fc5881772d033ac078db3a1)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Thu Jul 6 14:43:10 2006 -0700

    GL proto version 1.4.7 needed for texture-from-pixmap defines.
    
    GLX_TEXTURE_TARGET_EXT and GLX_TEXTURE_RECTANGLE_EXT are defined as a part
    of the new texture from pixmap GL extension in gl proto version 1.4.7 and
    are now used by the X server code.

diff --git a/configure.ac b/configure.ac
index 55f002e..fae6d7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -572,7 +572,7 @@ fi
 
 if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
 	PKG_CHECK_MODULES([XLIB], [x11])
-	PKG_CHECK_MODULES([GL], [glproto >= 1.4.6])
+	PKG_CHECK_MODULES([GL], [glproto >= 1.4.7])
 	AC_SUBST(XLIB_CFLAGS)
 	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
 	GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'