diff options
| author | Yao Zi <ziyao@disroot.org> | 2024-07-06 20:12:26 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2024-07-24 10:39:10 +0100 |
| commit | 581b4cd5f16d618787bd1e292b851c62c2626da0 (patch) | |
| tree | 11cf98317af36e1bfb8354803a12778266ff61e1 | |
| parent | 9263c4173ff5941a8ad1865254131da68d0d7084 (diff) | |
| download | focaccia-qemu-581b4cd5f16d618787bd1e292b851c62c2626da0.tar.gz focaccia-qemu-581b4cd5f16d618787bd1e292b851c62c2626da0.zip | |
meson.build: fix libgcrypt detection on system without libgcrypt-config
libgcrypt starts providing correct pkg-config configuration since 1.9, in parallel with libgcrypt-config. Since 1.11 it may also stop installing libgcrypt-config in some scenarios. Use the auto method for detection of libgcrypt, in which meson will try both pkg-config and libgcrypt-config. Auto method for libgcrypt is supported by meson since 0.49.0, which is higher than the version qemu requires. Signed-off-by: Yao Zi <ziyao@disroot.org> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | meson.build | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 4eca361319..ec6fb7d69c 100644 --- a/meson.build +++ b/meson.build @@ -1696,7 +1696,6 @@ endif if not gnutls_crypto.found() if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled() gcrypt = dependency('libgcrypt', version: '>=1.8', - method: 'config-tool', required: get_option('gcrypt')) # Debian has removed -lgpg-error from libgcrypt-config # as it "spreads unnecessary dependencies" which in |