modify for use with recent autotools