Autoconf re-add, part IV