|
3 | 3 | ARG_ENABLE("intl", "Enable internationalization support", "no");
|
4 | 4 |
|
5 | 5 | if (PHP_INTL != "no") {
|
6 |
| - if (CHECK_LIB("icuuc.lib", "intl", PHP_INTL) && |
| 6 | + if (CHECK_LIB("icudt.lib", "intl", PHP_INTL) && |
| 7 | + CHECK_LIB("icuin.lib", "intl", PHP_INTL) && |
| 8 | + CHECK_LIB("icuio.lib", "intl", PHP_INTL) && |
| 9 | + CHECK_LIB("icuuc.lib", "intl", PHP_INTL) && |
7 | 10 | CHECK_HEADER_ADD_INCLUDE("unicode/utf.h", "CFLAGS_INTL")) {
|
8 | 11 | // always build as shared - zend_strtod.c/ICU type conflict
|
9 | 12 | EXTENSION("intl", "php_intl.c intl_convert.c intl_convertcpp.cpp intl_error.c ", true,
|
@@ -115,16 +118,9 @@ if (PHP_INTL != "no") {
|
115 | 118 | codepointiterator_methods.cpp ",
|
116 | 119 | "intl");
|
117 | 120 |
|
118 |
| - ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib"); |
119 |
| - |
120 | 121 | /* Compat for ICU before 58.1.*/
|
121 |
| - if (CHECK_LIB("icule.lib", "intl", PHP_INTL)) { |
122 |
| - ADD_FLAG("LIBS_INTL", "icule.lib"); |
123 |
| - } |
124 |
| - if (CHECK_LIB("iculx.lib", "intl", PHP_INTL)) { |
125 |
| - ADD_FLAG("LIBS_INTL", "iculx.lib"); |
126 |
| - } |
127 |
| - |
| 122 | + CHECK_LIB("icule.lib", "intl", PHP_INTL); |
| 123 | + CHECK_LIB("iculx.lib", "intl", PHP_INTL); |
128 | 124 | ADD_FLAG("CFLAGS_INTL", "/EHsc /DUNISTR_FROM_CHAR_EXPLICIT=explicit /DUNISTR_FROM_STRING_EXPLICIT=explicit /DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 /DU_HIDE_OBSOLETE_UTF_OLD_H=1");
|
129 | 125 | AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled");
|
130 | 126 | } else {
|
|
0 commit comments