From 8e242b3cb4cb9f7c2eeeec12a79d99a12c8e0ecf Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 23 Nov 2020 13:34:02 -0500 Subject: [PATCH] meson: use dependency() to find libjpeg Prefer pkg-config to find_library because some installations of libjpeg may place it outside the default search path. Reported-by: Stefan Weil Signed-off-by: Paolo Bonzini --- meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 5062407c70..360623ece9 100644 --- a/meson.build +++ b/meson.build @@ -654,9 +654,8 @@ if get_option('vnc').enabled() vnc = declare_dependency() # dummy dependency png = dependency('libpng', required: get_option('vnc_png'), method: 'pkg-config', static: enable_static) - jpeg = cc.find_library('jpeg', has_headers: ['jpeglib.h'], - required: get_option('vnc_jpeg'), - static: enable_static) + jpeg = dependency('libjpeg', required: get_option('vnc_jpeg'), + method: 'pkg-config', static: enable_static) sasl = cc.find_library('sasl2', has_headers: ['sasl/sasl.h'], required: get_option('vnc_sasl'), static: enable_static) -- 2.11.0