Add -I m4 back to ACLOCAL_AMFLAGS.