diff mbox series

[1/3] meson: Don't force use of libgcrypt-config

Message ID 20220119171800.491703-2-abologna@redhat.com (mailing list archive)
State New, archived
Headers show
Series meson: Don't pass 'method' to dependency() | expand

Commit Message

Andrea Bolognani Jan. 19, 2022, 5:17 p.m. UTC 
libgcrypt 1.9.0 (released in 2021-01) ships with a proper
pkg-config file, which Meson's libgcrypt detection code can use
if available.

Passing 'config-tool' as 'method' when calling dependency(),
however, forces Meson to ignore the pkg-config file and always
use libgcrypt-config instead.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 meson.build | 1 -
 1 file changed, 1 deletion(-)
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index 762d7cee85..bc17ba67fd 100644
--- a/meson.build
+++ b/meson.build
@@ -1036,7 +1036,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'),
                         kwargs: static_kwargs)
     # Debian has removed -lgpg-error from libgcrypt-config