summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2015-08-29 12:41:02 +0200
committerinfirit <[email protected]>2015-08-29 12:41:02 +0200
commitffa3f5cad0ed50833d6989ca72dd93e77d4b3400 (patch)
tree21393dd7485fe921c7a42746d4ad650731f59dd2
parentfd4d42a3ee5f95efc9ffc0c0df4dc4f2b8c29d6a (diff)
downloadmate-control-center-ffa3f5cad0ed50833d6989ca72dd93e77d4b3400.tar.bz2
mate-control-center-ffa3f5cad0ed50833d6989ca72dd93e77d4b3400.tar.xz
Cleanup configure.ac wrt Xft2
-rw-r--r--configure.ac12
1 files changed, 1 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 3a4cb0f3..8cfe7793 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,17 +197,7 @@ AC_SUBST(WARN_CFLAGS)
AM_CONDITIONAL(HAVE_LIBMATESLAB, [test $have_libmateslab = yes])
-dnl
-dnl Check for Xft version 2; we build in extra functionality to the font capplet
-dnl when we have it.
-dnl
-xft_modules=
-if $PKG_CONFIG --exists xft ; then
- xft_modules="xft"
- AC_DEFINE(HAVE_XFT2,,[Define if Xft functionality is available])
-fi
-
-PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES $xft_modules fontconfig)
+PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES pango)
PKG_CHECK_MODULES(FONT_VIEWER, $COMMON_MODULES $xft_modules freetype2)
PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES)