diff --git a/meson.build b/meson.build index 6dafaad6e..5a2f4dff6 100644 --- a/meson.build +++ b/meson.build @@ -206,6 +206,18 @@ endif lzo_dep = dependency('lzo2', required: get_option('lzo')) if lzo_dep.found() conf.set('HAVE_LZO', 1) + # LZO <= 2.10 expects its headers to be included as , but + # its pkg-config file specifies -I${includedir}/lzo, so the compiler won't + # find the headers if LZO is installed outside the default include paths. + # Add the correct include path. + lzo_includedir = lzo_dep.get_variable('includedir', default_value: '') + if lzo_includedir != '' + # LZO is not being built as a sibling Meson subproject + lzo_dep = declare_dependency( + compile_args: '-I' + lzo_includedir, + dependencies: lzo_dep, + ) + endif endif dl_dep = cc.find_library('dl', required: false) diff --git a/util/cairo-script/cairo-script-file.c b/util/cairo-script/cairo-script-file.c index c45cc5086..7027f6027 100644 --- a/util/cairo-script/cairo-script-file.c +++ b/util/cairo-script/cairo-script-file.c @@ -42,7 +42,7 @@ #include #if HAVE_LZO -#include +#include #endif #define CHUNK_SIZE 32768 diff --git a/util/cairo-script/cairo-script-operators.c b/util/cairo-script/cairo-script-operators.c index a5eca6ffc..21fba5cc7 100644 --- a/util/cairo-script/cairo-script-operators.c +++ b/util/cairo-script/cairo-script-operators.c @@ -60,7 +60,7 @@ #endif #if HAVE_LZO -#include +#include #endif #ifdef HAVE_MMAP diff --git a/util/cairo-script/cairo-script-scanner.c b/util/cairo-script/cairo-script-scanner.c index 167cd7a1e..a69ae5f5a 100644 --- a/util/cairo-script/cairo-script-scanner.c +++ b/util/cairo-script/cairo-script-scanner.c @@ -46,7 +46,7 @@ #include #if HAVE_LZO -#include +#include #endif #define DEBUG_SCAN 0