* meson.build: Fix 'png' build option (#59458).

Without this patch, 'png' is always required.
4 years ago · c6345ca36d
parent 74f1b6be4a
commit c6345ca36d
2 changed files with 10 additions and 2 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2021-01-06  Torsten Hilbrich  <emacs.nolkaf@hilbrich.tk>
+
+	* meson.build: Fix 'png' build option (#59458).
+
+	Without this patch, 'png' is always required.
+
 2021-01-04  Alexei Podtelezhnikov  <apodtele@gmail.com>

 	[builds/windows] Add SDF to VC2010 project.
--- a/meson.build
+++ b/meson.build
@ -264,8 +264,10 @@ endif

 # PNG support
 libpng_dep = dependency('libpng', required: get_option('png'))
-ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_PNG']
-ft2_deps += [libpng_dep]
+if libpng_dep.found()
+  ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_PNG']
+  ft2_deps += [libpng_dep]
+endif

 # Harfbuzz support
 harfbuzz_dep = dependency('harfbuzz',