Less hacky vars in configure