Modifications so we can use the latest versions of the autotools.