Log Message:
Simplify the logic for libiconv -- we always have a gettext that depends
on it for the non-native case. This seems to help with some issues on
Solaris.