automake 1.13 fixes