qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Weil <sw@weilnetz.de>
Subject: [PULL 1/5] meson: use dependency() to find libjpeg
Date: Thu, 26 Nov 2020 02:59:17 -0500	[thread overview]
Message-ID: <20201126075921.3116321-2-pbonzini@redhat.com> (raw)
In-Reply-To: <20201126075921.3116321-1-pbonzini@redhat.com>

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




  reply	other threads:[~2020-11-26  8:05 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-26  7:59 [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 Paolo Bonzini
2020-11-26  7:59 ` Paolo Bonzini [this message]
2020-11-26  7:59 ` [PULL 2/5] configure: remove python pkg_resources check Paolo Bonzini
2020-11-26  7:59 ` [PULL 3/5] tests/docker, tests/vm: remove setuptools from images Paolo Bonzini
2020-11-26  7:59 ` [PULL 4/5] target/i386: fix operand order for PDEP and PEXT Paolo Bonzini
2020-11-26  7:59 ` [PULL 5/5] nsis: Fix build for 64 bit installer Paolo Bonzini
2020-11-26  8:12 ` [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 no-reply
2020-11-26 10:10 ` Peter Maydell
2020-11-26 10:53   ` Paolo Bonzini
2020-11-26 14:12 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201126075921.3116321-2-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sw@weilnetz.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).