OSDN Git Service

meson: use dependency() to find libjpeg
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 23 Nov 2020 18:34:02 +0000 (13:34 -0500)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 23 Nov 2020 18:34:02 +0000 (13:34 -0500)
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>
meson.build

index 5062407..360623e 100644 (file)
@@ -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)