[PATCH] Xext: Require newer versions of xcmiscproto, bigreqsproto, and xf86bigfontproto for new *proto.h header file names

[Jeremy Huddleston]

I know that trunk is frozen, so I wanted to run this by first... do we  
want to enforce the new *proto.h headers across the board in 1.7, or  
do we want to still allow the old *proto packages (using the *str.h  
stub where available)

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 e50376c..e666a59 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -36,7 +36,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 aed2e4e..f644cb4 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -37,7 +37,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 9e0b5ea..aeea233 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 c5c069d..097e780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -708,7 +708,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la'
  XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'

  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 [xextproto >=  
7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto  
resourceproto fontsproto [inputproto >= 1.9.99.902] [kbproto >= 1.0.3]"
+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_LIBS="xfont xau [pixman-1 >= 0.15.20]"

  dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
@@ -990,7 +990,7 @@ fi
  AM_CONDITIONAL(XF86BIGFONT, [test "x$XF86BIGFONT" = xyes])
  if test "x$XF86BIGFONT" = xyes; then
  	AC_DEFINE(XF86BIGFONT, 1, [Support XF86 Big font extension])
-	REQUIRED_MODULES="$REQUIRED_MODULES xf86bigfontproto"
+	REQUIRED_MODULES="$REQUIRED_MODULES [xf86bigfontproto >= 1.2.0]"
  fi

  AM_CONDITIONAL(DPMSExtension, [test "x$DPMSExtension" = xyes])