Moved aclocal.m4 to acinclude.m4. To re-generate the configure script,