Build fixes for xserver

[Peter Hutterer]

On Sat, Sep 19, 2009 at 04:24:20PM -0400, Thomas Jaeger wrote:
> Hi Peter,
> 
> These are just two trivial build fixes that I needed to build the server
> without updating my client libraries first.
> 
> Thanks,
> Tom

> From b65ec5a0b4ef18da0798cf5a811854d907b82906 Mon Sep 17 00:00:00 2001
> From: Thomas Jaeger <ThJaeger at gmail.com>
> Date: Sat, 19 Sep 2009 16:01:52 -0400
> Subject: [PATCH 1/2] Bump fixesproto requirement to 4.1
> 
> Signed-off-by: Thomas Jaeger <ThJaeger at gmail.com>
> ---
>  configure.ac |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index e648646..300f659 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
> -- 
> 1.6.3.3
> 

> From e5be283fd68bb44de7fe87a03612c47d2ff83fcf Mon Sep 17 00:00:00 2001
> From: Thomas Jaeger <ThJaeger at gmail.com>
> Date: Sat, 19 Sep 2009 15:48:30 -0400
> Subject: [PATCH 2/2] Xext: include security protocol header instead of client header
> 
> Signed-off-by: Thomas Jaeger <ThJaeger at gmail.com>
> ---
>  Xext/securitysrv.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> 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
> -- 
> 1.6.3.3

thank you. merged and will be pushed shortly.

Cheers,
  Peter