Log Message:
Fix obvious automake-1.13 issues.

This still doesn't build for me, in xvidcore if I read correctly,
but I don't understand why not.