xserver: Branch 'xorg-server-1.5-apple'

[Jeremy Huddleston]

 Xext/bigreq.c      |    2 +-
 Xext/xcmisc.c      |    2 +-
 Xext/xf86bigfont.c |    3 +--
 configure.ac       |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 545161ea9e6df9a5f4fc0a57c52de1c7a134af44
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 31 18:09:52 2009 -0700

    Xext: Require newer versions of xcmiscproto, bigreqsproto, and xf86bigfontproto for new *proto.h header file names
    
    bigreqsproto >= 1.1.0
    xcmiscproto >= 1.2.0
    xf86bigfontproto >= 1.2.0

diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 4f0724b..188d1b3 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -37,7 +37,7 @@ from The Open Group.
 #include "os.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include <X11/extensions/bigreqstr.h>
+#include <X11/extensions/bigreqproto.h>
 #include "opaque.h"
 #include "modinit.h"
 
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index a42d2e2..35db477 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -39,7 +39,7 @@ from The Open Group.
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
-#include <X11/extensions/xcmiscstr.h>
+#include <X11/extensions/xcmiscproto.h>
 #include "modinit.h"
 
 #if HAVE_STDINT_H
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index d5c5704..9f491b6 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -72,8 +72,7 @@
 #include "dixfontstr.h"
 #include "extnsionst.h"
 
-#define _XF86BIGFONT_SERVER_
-#include <X11/extensions/xf86bigfstr.h>
+#include <X11/extensions/xf86bigfproto.h>
 
 static void XF86BigfontResetProc(
     ExtensionEntry *	/* extEntry */
diff --git a/configure.ac b/configure.ac
index c925e8f..a8ef7a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -700,7 +700,7 @@ else
 	RENDERPROTO="renderproto"
 fi
 
-REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.3] [xproto >= 7.0.9] [xtrans >= 1.2.2] [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.4] [kbproto >= 1.0.3]"
+REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xextproto >= 7.0.99.3] [xproto >= 7.0.9] [xtrans >= 1.2.2] [scrnsaverproto >= 1.1] [bigreqsproto >= 1.1.0] resourceproto fontsproto [inputproto >= 1.4.4] [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.9.5]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas