updates to m4/w32