meson.build: Pull in fallback for PangoFT2 only when needed

On some systems PangoFT2 is optional, so we only use the fallback when
it is being required.
This commit is contained in:
Chun-wei Fan 2019-03-29 16:47:31 +08:00
parent 6f470affef
commit 6b08227110

View File

@ -331,8 +331,7 @@ fribidi_dep = dependency('fribidi', version: fribidi_req,
# Require PangoFT2 if on X11 or wayland # Require PangoFT2 if on X11 or wayland
require_pangoft2 = wayland_enabled or x11_enabled require_pangoft2 = wayland_enabled or x11_enabled
pangoft_dep = dependency('pangoft2', required: require_pangoft2, pangoft_dep = dependency('pangoft2', required: false)
fallback : ['pango', 'libpangoft2_dep'])
if pangoft_dep.found() if pangoft_dep.found()
# Need at least 2.7.1 for FT_Get_Var_Design_Coordinates() # Need at least 2.7.1 for FT_Get_Var_Design_Coordinates()
@ -361,6 +360,10 @@ if pangoft_dep.found()
endif endif
endif endif
if require_pangoft2
pangoft_dep = dependency('pangoft2', fallback : ['pango', 'libpangoft2_dep'])
endif
if win32_enabled if win32_enabled
# for GTK_IM_CONTEXT_IME # for GTK_IM_CONTEXT_IME
pangowin32_dep = dependency('pangowin32') pangowin32_dep = dependency('pangowin32')