From 527ad94a7e2f27113b9c33c1fffe77947c93e993 Mon Sep 17 00:00:00 2001 From: Jehan Date: Wed, 28 Mar 2018 19:43:17 +0200 Subject: [PATCH] Bug 794772 - detect freetype2 using pkg-config. I hesitated keeping both the pkg-config and freetype-config (which is mostly a wrapper to pkg-config nowadays apparently) as fallback, but anyway I can see in their repositories that they have a pkg-config file since 2003. Really I don't think it makes sense to hold onto such old and deprecated dependency configuration systems. --- configure.ac | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 6b27bb1195..dbeb85a641 100644 --- a/configure.ac +++ b/configure.ac @@ -863,13 +863,8 @@ if test "x$fontconfig_ok" = xno; then fi -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) -if test "x$FREETYPE_CONFIG" != "xno" ; then - AC_MSG_CHECKING([for freetype libraries]) - FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` - AC_MSG_RESULT($FREETYPE_LIBS) -fi -AC_SUBST(FREETYPE_LIBS) +PKG_CHECK_MODULES(FONTCONFIG, freetype2 >= freetype2_required_version,, + [add_deps_error([freetype2_required_version >= freetype2_required_version])]) PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= harfbuzz_required_version,, [add_deps_error([harfbuzz >= harfbuzz_required_version])])