diff options
| author | Uli Schlachter <psychon@znc.in> | 2021-05-22 08:16:47 +0200 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2021-05-22 08:16:47 +0200 |
| commit | 1e34651420fa77edb09045ee0ff33432c4e73d70 (patch) | |
| tree | 656c3d2de9cff543447b0f4112cc39a309b9a323 /util | |
| parent | 1981fb6dfb51f44feb68590f51309520185e0780 (diff) | |
| download | cairo-1e34651420fa77edb09045ee0ff33432c4e73d70.tar.gz | |
Fix meson build without zlib
Trying to build with meson with -Dzlib=disabled failed with the
following error message:
cairo/test/meson.build:599:2: ERROR: Unknown variable
"libcairoscript_dep".
This commit fixes that problem by adding a not-found dependency if
cairo-script is not built.
Additionally, follow-up problems are fixed:
- any2ppm.c still tried to include cairo-script-interpreter.h, which was
not found
- Building cairo-test-trace was attempted, but that also failed because
of missing script support.
Fixes: https://gitlab.freedesktop.org/cairo/cairo/-/issues/475
Signed-off-by: Uli Schlachter <psychon@znc.in>
Diffstat (limited to 'util')
| -rw-r--r-- | util/meson.build | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/util/meson.build b/util/meson.build index 0fa8ec758..152b23729 100644 --- a/util/meson.build +++ b/util/meson.build @@ -8,6 +8,8 @@ endif if conf.get('CAIRO_HAS_INTERPRETER', 0) == 1 subdir('cairo-script') +else + libcairoscript_dep = dependency('', required: false) endif if conf.get('CAIRO_HAS_TRACE', 0) == 1 |