Move the minor i386-specific logic to a dedicated variable so we can merge its configure logic up a level.