diff options
| author | Werner Lemberg <wl@gnu.org> | 2020-10-26 18:09:56 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2020-10-26 18:09:56 +0100 |
| commit | 40c5681ab92e7db1298273ccf3c816e6a1498260 (patch) | |
| tree | 17a726f3f716f41f11d4307ee6a4a42ccba65d0e | |
| parent | 007c109b4594c5e63948bd08b4d5011ad76ffb10 (diff) | |
| download | freetype2-40c5681ab92e7db1298273ccf3c816e6a1498260.tar.gz | |
* meson.build: Fix 'harfbuzz' and 'brotli' build options (#59347).
Without this patch, 'harfbuzz' and 'brotli' are always required.
Patch submitted anonymously in Savannah bug report.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | meson.build | 12 |
2 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2020-10-26 Werner Lemberg <wl@gnu.org> + + * meson.build: Fix 'harfbuzz' and 'brotli' build options (#59347). + + Without this patch, 'harfbuzz' and 'brotli' are always required. + + Patch submitted anonymously in Savannah bug report. + 2020-10-23 Ben Wagner <bungeman@google.com> * src/sfnt/pngshim.c (Load_SBit_Png): Fix memory leak (#59322). diff --git a/meson.build b/meson.build index ea304954e..c99497653 100644 --- a/meson.build +++ b/meson.build @@ -267,13 +267,17 @@ ft2_deps += [libpng_dep] harfbuzz_dep = dependency('harfbuzz', version: '>= 1.8.0', required: get_option('harfbuzz')) -ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ'] -ft2_deps += [harfbuzz_dep] +if harfbuzz_dep.found() + ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ'] + ft2_deps += [harfbuzz_dep] +endif # Brotli decompression support brotli_dep = dependency('libbrotlidec', required: get_option('brotli')) -ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BROTLI'] -ft2_deps += [brotli_dep] +if brotli_dep.found() + ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BROTLI'] + ft2_deps += [brotli_dep] +endif # We can now generate `ftoption.h`. ftoption_h = custom_target('ftoption.h', |