Apply a patch from James Henstridge for compatibility with automake 2.60