4.5 merge #4: more autoconf