changing things to fit autoconf layout