diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-12-09 11:01:54 +0000 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-12-13 17:38:18 -0800 |
| commit | 9f53de00afaf19f9acdb5a796641992ffdaeb255 (patch) | |
| tree | e44e7b2f9c50cee683769240bf5d009df8511ff7 | |
| parent | 5f01ea79f1cb2328bfc4130b1e693f71be916b87 (diff) | |
| download | xorg-font-util-9f53de00afaf19f9acdb5a796641992ffdaeb255.tar.gz | |
fontutil.m4.in: use $PKG_CONFIG instead of pkg-config
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 <ross.burton@intel.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | fontutil.m4.in | 3 |
1 files changed, 2 insertions, 1 deletions
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}]) ]) |