Fix issues running 'make check' after bootstrapping with newer versions of automake