On 13-12-09 06:01 AM, Ross Burton wrote:
> Instead of assuming that pkg-config is on the path, require
> PKG_PROG_PKG_CONFIG
> to be called and use $PKG_CONFIG.
>
> Signed-off-by: Ross Burton <[email protected]>
> ---
> fontutil.m4.in | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fontutil.m4.in b/fontutil.m4.in
> index 98f4781..ff2f053 100644
> --- a/fontutil.m4.in
> +++ b/fontutil.m4.in
> @@ -282,10 +282,11 @@ AC_DEFUN([XORG_FONT_CHECK_COMPRESSION],[
> # by ucs2any, and export it as MAPFILES_PATH to the Makefiles
>
> AC_DEFUN([XORG_FONT_UCS2ANY],[
> + AC_REQUIRE([PKG_PROG_PKG_CONFIG])
> XORG_FONT_REQUIRED_PROG(UCS2ANY, ucs2any)
> PKG_CHECK_MODULES(MAPS, [fontutil])
> AC_MSG_CHECKING([for ucs2any encoding data files])
> - MAPFILES_PATH=`pkg-config --variable=mapdir fontutil`
> + MAPFILES_PATH=`$PKG_CONFIG --variable=mapdir fontutil`
> AC_SUBST(MAPFILES_PATH)
> AC_MSG_RESULT([${MAPFILES_PATH}])
> ])
Reviewed-by: Gaetan Nadon <[email protected]>
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
