Moving things around, sticking with Autotools.
Cleaning up, reducing.
More tweaks... still not getting the right configuration parameters everywhere.