Merge: omit auto-generated aclocal.m4 from repository