Convert from our use of aclocal.m4 to a subdirectory with autoconf macros