[Git][freetype/freetype][master] * meson.build: Fix zlib support.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 09195a82
  by Werner Lemberg at 2021-08-02T12:55:28+02:00

  * meson.build: Fix zlib support.
  
  This commit synchronizes zlib support with both autotools and cmake: If no
  external zlib is found (or intentionally disabled on the command line), use
  the internal zlib by undefining `FT_CONFIG_OPTION_SYSTEM_ZLIB` without
  modifying `FT_CONFIG_OPTION_USE_ZLIB`.
  
  Also improve summary output.
  
  Problem reported by Moazin.
  

1 changed file:

• meson.build

Changes:

meson.build

---

...	...	@@ -87,7 +87,7 @@ foreach mod: ft_main_modules
87	87	ft2_sources += 'src/@0@/@1@.c'.format(mod, source)
88	88	endforeach
89	89
90		-# NOTE: The `gzip` and `bzip2` aux modules are handled through options.
	90	+# NOTE: The `bzip2` aux module is handled through options.
91	91	ft_aux_modules = run_command(python_exe,
92	92	files('builds/meson/parse_modules_cfg.py'),
93	93	'--format=aux-modules',
...	...	@@ -101,7 +101,9 @@ foreach auxmod: ft_aux_modules
101	101	source = 'ftcache'
102	102	elif auxmod == 'lzw'
103	103	source = 'ftlzw'
104		- elif auxmod == 'gzip' or auxmod == 'bzip2'
	104	+ elif auxmod == 'gzip'
	105	+ source = 'ftgzip'
	106	+ elif auxmod == 'bzip2'
105	107	# Handled through options instead, see below.
106	108	continue
107	109	endif
...	...	@@ -243,20 +245,16 @@ process_header_command = [python_exe,
243	245	ftoption_command = process_header_command
244	246
245	247
246		-# GZip support
	248	+# external GZip support
247	249	zlib_dep = dependency('zlib',
248	250	required: get_option('zlib'),
249	251	fallback: 'zlib')
250	252
251	253	if zlib_dep.found()
252		- ftoption_command += [
253		- '--enable=FT_CONFIG_OPTION_USE_ZLIB',
254		- '--enable=FT_CONFIG_OPTION_SYSTEM_ZLIB',
255		- ]
256		- ft2_sources += files(['src/gzip/ftgzip.c',])
	254	+ ftoption_command += ['--enable=FT_CONFIG_OPTION_SYSTEM_ZLIB']
257	255	ft2_deps += [zlib_dep]
258	256	else
259		- ftoption_command += ['--disable=FT_CONFIG_OPTION_USE_ZLIB']
	257	+ ftoption_command += ['--disable=FT_CONFIG_OPTION_SYSTEM_ZLIB']
260	258	endif
261	259
262	260	# BZip2 support
...	...	@@ -400,11 +398,13 @@ gen_docs = custom_target('freetype2 reference documentation',
400	398
401	399
402	400	summary({'OS': host_machine.system(),
403		- 'Zlib': zlib_dep.found() ? 'yes' : 'no',
	401	+ }, section: 'Operating System')
	402	+
	403	+summary({'Zlib': zlib_dep.found() ? 'external' : 'internal',
404	404	'Bzip2': bzip2_dep.found() ? 'yes' : 'no',
405	405	'Png': libpng_dep.found() ? 'yes' : 'no',
406	406	'Harfbuzz': harfbuzz_dep.found() ? 'yes' : 'no',
407	407	'Brotli': brotli_dep.found() ? 'yes' : 'no',
408		- }, section: 'Configuration Options Summary:')
	408	+ }, section: 'Used Libraries')
409	409
410	410	# EOF

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.