Further GNU autotools migration work