Recently some changes has been applied only to autotools. This MR applies those same changes also to meson.