Further changes for migration to GNU autotools