updated from automake 1.11.1