[meson] Change Zlib configuration option.

* meson_options.txt, meson.build: Change the format of the 'zlib' meson
build configuration option to be a combo with the following choices:

  - none: Do not support gzip-compressed streams at all.

  - internal: Support gzip-compressed streams using the copy of the gzip
    sources under `src/gzip/`; this should only be used during development
    to ensure these work properly.

  - external: Support gzip-compressed streams using the 'zlib' Meson
    subproject, linked as a static library.

  - system: Support gzip-compressed streams using a system-installed version
    of zlib.

  - auto: Support gzip-compressed streams using a system-installed version
    of zlib, if available, or using the 'zlib' subproject otherwise.  This
    is the default.

  - disabled: Backward-compatible alias for 'none'.

  - enabled: Backward-compatible alias for 'auto'.
This commit is contained in:
David Turner
2021-08-17 17:27:36 +02:00
committed by Werner Lemberg
parent d276bcb7f0
commit 0d34386366
2 changed files with 45 additions and 9 deletions

View File

@@ -46,8 +46,10 @@ option('tests',
description: 'Enable FreeType unit and regression tests')
option('zlib',
type: 'feature',
value: 'auto',
type: 'combo',
choices: [ 'auto', 'none',
'internal', 'external', 'system',
'disabled', 'enabled' ],
description: 'Support reading gzip-compressed font files')
# EOF