More autoconf fixes