diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2019-04-14 21:07:58 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-04-15 11:09:49 -0700 |
| commit | f5bc0ab44aa66450957a1fb9546b50f8d986d263 (patch) | |
| tree | c1006f7e8c75911a051912953c610e4a7dd4822f /docs | |
| parent | 53a7403f10f7e286f305ee4e06b10ba4db756e48 (diff) | |
| download | meson-f5bc0ab44aa66450957a1fb9546b50f8d986d263.zip meson-f5bc0ab44aa66450957a1fb9546b50f8d986d263.tar.gz meson-f5bc0ab44aa66450957a1fb9546b50f8d986d263.tar.bz2 | |
fix gpgme support by preferring pkg-config where possible
Since gpgme 1.13.0, pkg-config files are available and this is the
preferred way to detect the dependency. Without this, projects that wish
to generate pkg-config files that Requires.private on gpgme, now have
their custom dependency() fallbacks overridden with an incorrect
configtool dependency.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/markdown/Dependencies.md | 2 | ||||
| -rw-r--r-- | docs/markdown/snippets/gpgme-config.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index 2789ee0..50dbcf5 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -394,7 +394,7 @@ The `language` keyword may used. *(added 0.51.0)* -`method` may be `auto` or `config-tool`. +`method` may be `auto`, `config-tool` or `pkg-config`. ## Python3 diff --git a/docs/markdown/snippets/gpgme-config.md b/docs/markdown/snippets/gpgme-config.md index 08a7d38..65569fb 100644 --- a/docs/markdown/snippets/gpgme-config.md +++ b/docs/markdown/snippets/gpgme-config.md @@ -1,3 +1,3 @@ ## gpgme dependency now supports gpgme-config -Previously, we could only detect GPGME with custom invocations of `gpgme-config`. Now we added support to Meson allowing us to use `dependency('gpgme')` instead. +Previously, we could only detect GPGME with custom invocations of `gpgme-config` or when the GPGME version was recent enough (>=1.13.0) to install pkg-config files. Now we added support to Meson allowing us to use `dependency('gpgme')` and fall back on `gpgme-config` parsing. |