Backport changes from SVN run autotools