diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2018-10-12 14:17:29 +0000 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2018-10-12 14:17:29 +0000 |
| commit | ad26d15133c88394362acb797ce072302051a899 (patch) | |
| tree | 24323ebc05cb1349bdd3cc599dfda7e9219b7b00 /pango/meson.build | |
| parent | 962cf9a41942f998e25d5d22b2110b85b670b718 (diff) | |
| parent | 86855b6a458fd9b82d246f723a7e3c9cdb37a8a0 (diff) | |
| download | pango-ad26d15133c88394362acb797ce072302051a899.tar.gz | |
Merge branch 'wip/nirbheek/subproject-fallback-fixes' into 'master'
meson: Add subproject fallbacks for most dependencies
See merge request GNOME/pango!22
Diffstat (limited to 'pango/meson.build')
| -rw-r--r-- | pango/meson.build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pango/meson.build b/pango/meson.build index 254b169a..0466915f 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -159,7 +159,6 @@ pkgconfig.generate(libpango, version: meson.project_version(), filebase: 'pango', subdirs: pango_api_name, - requires: gobject_dep, install_dir: join_paths(pango_libdir, 'pkgconfig'), ) @@ -256,10 +255,13 @@ if build_pangoft2 else # For usage as a subproject libpangoft2_dep = dependency('', required : false) + # Needed for making ft2 no-op while generating pangoxft_gir below + pangoft2_gir_dep = dependency('', required : false) + pangoft2_gir = [[]] endif # Xft -if xft_dep.found() +if xft_dep.found() and fontconfig_dep.found() pangoxft_headers = [ 'pangoxft.h', 'pangoxft-render.h', |