Remove dependency on external m4