automake 1.5 fixes

Original commit message from CVS:
automake 1.5 fixes
2 files changed