Merge pull request #232 from c0nk/wip-icu

Add --with-icu=builtin option; fix compile error