Skip to content

meson: Use more dependency objects & fix build without zlib

Uli Schlachter requested to merge psychon/cairo:build-without-zlib into master

For example, to depend on cairo-script, inccairoscript was added to "include_directories:" and libcairoscript was added to "link_with:". This commit instead uses the libcairoscript_dep dependency everywhere.

Signed-off-by: Uli Schlachter psychon@znc.in

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: #475 (closed) Signed-off-by: Uli Schlachter psychon@znc.in

Thanks a lot to Tim for teaching me meson! :-)

Merge request reports