Reorganise configure.ac layout (and simplify)