Run "autoreconf" (from autoconf-2.57) to rebuild:
aclocal.m4 config.h.in configure
This appears to be a cleaner solution than hand-hacking/merging
changes to **/Makefile.in after each import.
Recently suggested by a couple of people, and confirmed with Ben Elliston.