Add the m4 directory back

Some versions of aclocal treat this as an error and autoreconf runs
aclocal before libtoolize so the m4 directory doesn't exist at this point.
Revert this back as well

For the sake of consistency wrt re-adding m4/