Tweaks to the configure script

Review 608 by @srh
Closes #948