Rework previous autoconf changes, hopefully to make clearer.