Autoconf re-add, part III