Change autoconf logic a bit so it says what it is looking for in two instances where...