Revert aclocal invocation to do cat m4/*.m4 > acinclude.m4 beforehand, rather than adding m4/ to aclocal search path....

Original commit message from CVS:
Revert aclocal invocation to do cat m4/*.m4 > acinclude.m4 beforehand,
rather than adding m4/ to aclocal search path.  Shouldn't cause errors when
macros are already present on system, because macros in acinclude.m4 are
used in preference.