autotools: changes suggested by Pieter Wuille