Further work on configure script