Move DOLT macro back into acinclude.m4 so it works