Add aclocal.m4 again