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

[Dan Nicholson]

On Tue, Feb 2, 2010 at 5:03 PM, Jeremy Huddleston
<jeremyhu at freedesktop.org> wrote:
>
> 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]"

Do these actually change anything? autoconf is just going to remove
the [] after processing through m4, and having >= within quotes in
shell is fine. There's a lot of this excessive quoting/unquoting in
the x configure.ac's, and all that's really needed is to make sure
that the arguments to the autoconf m4 macros are quoted...

>        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],

like this. Can you show the warning that was being printed?

--
Dan