- fix building with automake 1.13
- fix autotools regen
- rel 6