Removed references to m4 directory as we should allow these to come from the host installation rather than provide our own.