revert taking libiconv out and fix flags for AIX