Autoconf cleanup