Update the fix for issue4064 to deal correctly with all three variants of
universal builds that are presented by the configure script.
2 files changed