Per the trunk, consolidate all configure scripts in the top-level directory so that future CMR's quit conflicting