xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 Xext/securitysrv.h |    2 +-
 configure.ac       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 971d4eac1274db78efa546ea50ca5e01a80bbd81
Author: Thomas Jaeger <ThJaeger at gmail.com>
Date:   Sat Sep 19 15:48:30 2009 -0400

    Xext: include security protocol header instead of client header
    
    Signed-off-by: Thomas Jaeger <ThJaeger at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/Xext/securitysrv.h b/Xext/securitysrv.h
index f4f3e32..3d3894a 100644
--- a/Xext/securitysrv.h
+++ b/Xext/securitysrv.h
@@ -40,7 +40,7 @@ from The Open Group.
 # define NEED_UNDEF_Display
 #endif
 
-#include <X11/extensions/security.h>
+#include <X11/extensions/secur.h>
 
 #ifdef NEED_UNDEF_Status
 # undef Status
commit a62664bc07b35aedb6b11b984c94341deb4486ca
Author: Thomas Jaeger <ThJaeger at gmail.com>
Date:   Sat Sep 19 16:01:52 2009 -0400

    Bump fixesproto requirement to 4.1
    
    Signed-off-by: Thomas Jaeger <ThJaeger at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index ede590f..ad3a208 100644
--- a/configure.ac
+++ b/configure.ac
@@ -735,7 +735,7 @@ WINDOWSWMPROTO="windowswmproto"
 APPLEWMPROTO="applewmproto >= 1.4"
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xextproto >= 7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] resourceproto fontsproto [inputproto >= 1.9.99.902] [kbproto >= 1.0.3]"
+REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xextproto >= 7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] resourceproto fontsproto [inputproto >= 1.9.99.902] [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.20]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas