- fix building with latest automake
- rel 6