next sundance patch in the series, updated with Jason's patches

Note, with the patching of Configure.help this is a 2.4-specific patch.