This merge has broken bootstrap on AIX. genmatch has a dependency on libintl and libiconv, but is not linked with those libraries.
ld: 0711-317 ERROR: Undefined symbol: .libintl_dgettext ld: 0711-317 ERROR: Undefined symbol: .libintl_bindtextdomain ld: 0711-317 ERROR: Undefined symbol: .libiconv ld: 0711-317 ERROR: Undefined symbol: .libiconv_open ld: 0711-317 ERROR: Undefined symbol: .libiconv_close make[3]: *** [build/genmatch] Error 1
