update from automake 1.6