More autoconf re-adding