From bf9314e00dde4160b1022168cff91e09c868935c Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 17 Oct 2023 10:36:19 -0400 Subject: pkgconfig: Allow setting both pkgconfig and pkg-config This was previously allowed for different usage. Keep allowing it, but with non fatal deprecation notice, and ignore the value from legacy pkgconfig. --- docs/markdown/snippets/pkgconfig_deprecated_machine_file.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 docs/markdown/snippets/pkgconfig_deprecated_machine_file.md (limited to 'docs') diff --git a/docs/markdown/snippets/pkgconfig_deprecated_machine_file.md b/docs/markdown/snippets/pkgconfig_deprecated_machine_file.md new file mode 100644 index 000000000..36647e90e --- /dev/null +++ b/docs/markdown/snippets/pkgconfig_deprecated_machine_file.md @@ -0,0 +1,10 @@ +## Machine files: `pkgconfig` field deprecated and replaced by `pkg-config` + +Meson used to allow both `pkgconfig` and `pkg-config` entries in machine files, +the former was used for `dependency()` lookup and the latter was used as return +value for `find_program('pkg-config')`. + +This inconsistency is now fixed by deprecating `pkgconfig` in favor of +`pkg-config` which matches the name of the binary. For backward compatibility +it is still allowed to define both with the same value, in that case no +deprecation warning is printed. -- cgit v1.2.3