Skip to content

Properly check for required icu4c libraries #17010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Properly check for required icu4c libraries #17010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions ext/intl/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
ARG_ENABLE("intl", "Enable internationalization support", "no");

if (PHP_INTL != "no") {
if (CHECK_LIB("icuuc.lib", "intl", PHP_INTL) &&
if (CHECK_LIB("icudt.lib", "intl", PHP_INTL) &&
CHECK_LIB("icuin.lib", "intl", PHP_INTL) &&
CHECK_LIB("icuio.lib", "intl", PHP_INTL) &&
CHECK_LIB("icuuc.lib", "intl", PHP_INTL) &&
CHECK_HEADER_ADD_INCLUDE("unicode/utf.h", "CFLAGS_INTL")) {
// always build as shared - zend_strtod.c/ICU type conflict
EXTENSION("intl", "php_intl.c intl_convert.c intl_convertcpp.cpp intl_error.c ", true,
Expand Down Expand Up @@ -115,16 +118,9 @@ if (PHP_INTL != "no") {
codepointiterator_methods.cpp ",
"intl");

ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib");

/* Compat for ICU before 58.1.*/
if (CHECK_LIB("icule.lib", "intl", PHP_INTL)) {
ADD_FLAG("LIBS_INTL", "icule.lib");
}
if (CHECK_LIB("iculx.lib", "intl", PHP_INTL)) {
ADD_FLAG("LIBS_INTL", "iculx.lib");
}

CHECK_LIB("icule.lib", "intl", PHP_INTL);
CHECK_LIB("iculx.lib", "intl", PHP_INTL);
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");
AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled");
} else {
Expand Down
Loading