Log Message:
Deal with the fact that Makefile.in is now regenerated by also patching
Makefile.am as appropiate. automake can't be run directly, since it
doesn't like configure itself.