aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-11-23 13:34:02 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2020-11-23 13:34:02 -0500
commit8e242b3cb4cb9f7c2eeeec12a79d99a12c8e0ecf (patch)
treea271d937eb3de7b04c1a20f46db537e9efb1b960
parent8cc30eb1400fc01f2b139cdd3dc524f8b84dbe07 (diff)
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 <sw@weilnetz.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--meson.build5
1 files 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)