buildworld - Attempt to fix m4 bootstrapping issue (2)