contrib: cleanup misc usage of autotools contribs

Extracted from !2550 (merged) as these should be safe to merge.

Draft as it sits on top of a patch from !1963 (merged) will need a manual rebase after it's merged