[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/5] meson: use dependency() to find libjpeg
From: |
Paolo Bonzini |
Subject: |
[PULL 1/5] meson: use dependency() to find libjpeg |
Date: |
Thu, 26 Nov 2020 02:59:17 -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 | 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.26.2
- [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2, Paolo Bonzini, 2020/11/26
- [PULL 2/5] configure: remove python pkg_resources check, Paolo Bonzini, 2020/11/26
- [PULL 3/5] tests/docker, tests/vm: remove setuptools from images, Paolo Bonzini, 2020/11/26
- [PULL 1/5] meson: use dependency() to find libjpeg,
Paolo Bonzini <=
- [PULL 4/5] target/i386: fix operand order for PDEP and PEXT, Paolo Bonzini, 2020/11/26
- [PULL 5/5] nsis: Fix build for 64 bit installer, Paolo Bonzini, 2020/11/26
- Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2, no-reply, 2020/11/26
- Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2, Peter Maydell, 2020/11/26
- Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2, Peter Maydell, 2020/11/26