summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2021-01-17 15:50:08 +0000
committerWerner Lemberg <wl@gnu.org>2021-03-07 17:54:21 +0100
commitbb42afbda084b0ac5b017f454fd1b262a94805dd (patch)
treef093dbcf8acddcde5f1ed198af0a99ce6702bb9b /meson.build
parentd69d9c2397afc86e95fef48226364723e14d506c (diff)
downloadfreetype2-bb42afbda084b0ac5b017f454fd1b262a94805dd.tar.gz
[meson] Add subproject fallbacks for 'libpng' and 'zlib'.
* subprojects/libpng.wrap, subprojects/zlib.wrap: New files. * meson.build: Updated.
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build5
1 files changed, 2 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 93b489487..c3984569f 100644
--- a/meson.build
+++ b/meson.build
@@ -229,8 +229,7 @@ ftoption_command = process_header_command
# GZip support
-zlib_dep = dependency('zlib', required: get_option('zlib'),
- fallback: ['zlib', 'zlib_dep'])
+zlib_dep = dependency('zlib', required: get_option('zlib'), fallback: 'zlib')
if zlib_dep.found()
ftoption_command += [
'--enable=FT_CONFIG_OPTION_USE_ZLIB',
@@ -251,7 +250,7 @@ if bzip2_dep.found()
endif
# PNG support
-libpng_dep = dependency('libpng', required: get_option('png'))
+libpng_dep = dependency('libpng', required: get_option('png'), fallback: 'libpng')
if libpng_dep.found()
ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_PNG']
ft2_deps += [libpng_dep]