4.0.2rc1 updates for autoconf