This uses a newer automake, than was in use previously, although that
wasn't the main point of doing this change.