[PATCH libX11 1/2] Fix warnings for recent bigreqsproto, xcmiscproto, and xf86bigfontproto

[Jeremy Huddleston]

Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
 configure.ac  |    6 +++---
 src/Font.c    |    2 +-
 src/OpenDis.c |    2 +-
 src/XlibInt.c |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0eea575..00ab51c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,13 +60,13 @@ AM_CONDITIONAL(XCB, test x$ac_cv_use_xcb != xno)
 # Checks for pkg-config packages
 
 # Always required
-X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans'
+X11_REQUIRES='[xproto >= 7.0.13] xextproto xtrans'
 
 PKG_PROG_PKG_CONFIG()
 
 case "$ac_cv_use_xcb" in
 no)
-	X11_REQUIRES="${X11_REQUIRES} xau xcmiscproto bigreqsproto"
+	X11_REQUIRES="${X11_REQUIRES} xau [xcmiscproto >= 1.2.0] [bigreqsproto >= 1.1.0]"
 	X11_EXTRA_DEPS="xau"
 	PKG_CHECK_MODULES(XDMCP, xdmcp,
 		AC_CHECK_LIB(Xdmcp, XdmcpWrap,
@@ -330,7 +330,7 @@ AC_ARG_ENABLE(xf86bigfont,
 		[Disable XF86BigFont extension support]),
 	      [XF86BIGFONT=$enableval],[XF86BIGFONT="yes"])
 if test "x$XF86BIGFONT" = "xyes"; then
-    PKG_CHECK_MODULES(BIGFONT, xf86bigfontproto,
+    PKG_CHECK_MODULES(BIGFONT, [xf86bigfontproto >= 1.2.0],
          AC_DEFINE(XF86BIGFONT,1,[Enable XF86BIGFONT extension]),XF86BIGFONT="no")
     AC_SUBST(BIGFONT_CFLAGS)
     AC_SUBST(BIGFONT_LIBS)
diff --git a/src/Font.c b/src/Font.c
index b664b8d..5479c83 100644
--- a/src/Font.c
+++ b/src/Font.c
@@ -45,7 +45,7 @@ authorization from the X Consortium and the XFree86 Project.
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <X11/extensions/xf86bigfstr.h>
+#include <X11/extensions/xf86bigfproto.h>
 #endif
 
 #include "Xlcint.h"
diff --git a/src/OpenDis.c b/src/OpenDis.c
index 46e1026..78cf74b 100644
--- a/src/OpenDis.c
+++ b/src/OpenDis.c
@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
 #include "Xxcbint.h"
 #else /* !USE_XCB */
 #include <X11/Xtrans/Xtrans.h>
-#include <X11/extensions/bigreqstr.h>
+#include <X11/extensions/bigreqsproto.h>
 #endif /* USE_XCB */
 #include <X11/Xatom.h>
 #include <X11/Xresource.h>
diff --git a/src/XlibInt.c b/src/XlibInt.c
index fb6e715..0f30f74 100644
--- a/src/XlibInt.c
+++ b/src/XlibInt.c
@@ -44,7 +44,7 @@ from The Open Group.
 #include <X11/Xpoll.h>
 #if !USE_XCB
 #include <X11/Xtrans/Xtrans.h>
-#include <X11/extensions/xcmiscstr.h>
+#include <X11/extensions/xcmiscproto.h>
 #endif /* !USE_XCB */
 #include <assert.h>
 #include <stdio.h>
-- 
1.6.2