Merge fixes for <rdar://problem/7852964> to fix <rdar://problem/8055743>. --- Merging r101090 into '.': U configure.in --- Merging r101091 into '.': U configure llvm-svn: 105486