More compatibility with automake 1.13.

This branch is based on `patches-2.0`.