[PATCH:libXfont-1.4 v2] Require fontsproto < 2.1.3 for matching function prototypes

[Thomas Klausner]

Looks good.

Reviewed-By: Thomas Klausner <wiz at NetBSD.org>

On Mon, Apr 21, 2014 at 07:31:59AM -0700, Alan Coopersmith wrote:
> Building libXfont-1.4.x against fontsproto 2.1.3 causes clang
> complaints of:
> 
> patcache.c:130:1: error: conflicting types for 'CacheFontPattern'
> CacheFontPattern (FontPatternCachePtr cache,
> ^
> patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern'
> FindCachedFontPattern (FontPatternCachePtr cache,
> ^
> 
> due to the constification of arguments not matching.
> 
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
> ---
> 
>  Oops, sent wrong patch before.
> 
>  configure.ac |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index cbb540a..4979c04 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -180,7 +180,7 @@ fi
>  AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm
>  AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required]))
>  
> -PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto fontenc)
> +PKG_CHECK_MODULES(XFONT, [xproto xtrans fontsproto < 2.1.3 fontenc])
>  
>  # Transport selection macro from xtrans.m4
>  XTRANS_CONNECTION_FLAGS
> -- 
> 1.7.9.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>