diff --git a/configure.in b/configure.in index 310e5a5..7195ab6 100644 --- a/configure.in +++ b/configure.in @@ -1765,6 +1765,8 @@ either XPointer or XPointer*.])dnl fi ### Start of font-backend section. +PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2.0, HAVE_FC=yes, HAVE_FC=no) +test "${HAVE_FC}" = "no" && with_freetype=no ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. HAVE_XFT=maybe @@ -1808,16 +1810,11 @@ if test "${HAVE_XFT}" = "yes"; then dnl As we use Xft, we anyway use freetype. dnl In this case, there's no need of additional CFLAGS and LIBS. HAVE_FREETYPE=yes + FONTCONFIG_CFLAGS= + FONTCONFIG_LIBS= elif test "x${with_freetype}" != "xno"; then PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no) - if test "${HAVE_FREETYPE}" = "yes"; then - PKG_CHECK_MODULES(FONTCONFIG, fontconfig, HAVE_FC=yes, HAVE_FC=no) - if test "${HAVE_FC}" = "no"; then - dnl Without fontconfig, we can't use freetype at the moment. - HAVE_FREETYPE=no - fi - fi fi HAVE_LIBOTF=no