summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-07-12 22:26:16 -0400
committerMatthias Clasen <mclasen@redhat.com>2019-07-12 22:26:16 -0400
commitabac455bbbc097ea01c867e409e22a4a3b20b172 (patch)
treec34894a23a76bb20f8d7cef6a5a2cda2028fc8ed /meson.build
parentca9511ea470aed6e6670b7ce431abc91b4ee7e4d (diff)
downloadpango-abac455bbbc097ea01c867e409e22a4a3b20b172.tar.gz
Revert "Reduce overlinking"
This reverts commit f972ba0562823a8d55ad02ff9609481a884c79f8.
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build8
1 files changed, 3 insertions, 5 deletions
diff --git a/meson.build b/meson.build
index d1150907..73b5da2b 100644
--- a/meson.build
+++ b/meson.build
@@ -183,8 +183,6 @@ endif
# Dependencies
pango_deps = []
-pangoxft_deps = []
-pangocairo_deps = []
glib_req_version = '>= 2.59.2'
fribidi_req_version = '>= 0.19.7'
@@ -316,8 +314,8 @@ endif
xft_dep = dependency('xft', version: xft_req_version, required: false)
if xft_dep.found() and fontconfig_dep.found() and freetype_dep.found()
pango_conf.set('HAVE_XFT', 1)
- pangoxft_deps += dependency('xrender', required: false)
- pangoxft_deps += xft_dep
+ pango_deps += dependency('xrender', required: false)
+ pango_deps += xft_dep
endif
if host_system == 'darwin'
@@ -490,7 +488,7 @@ endif
if cairo_dep.found()
pango_conf.set('HAVE_CAIRO', 1)
- pangocairo_deps += cairo_dep
+ pango_deps += cairo_dep
pangocairo_requires = ''