com php-src: make config.w32 compatible with ICU 58: ext/intl/config.w32
| From: | Anatol Belski | Date: | Wed, 26 Oct 2016 11:05:03 +0000 |
| Subject: | com php-src: make config.w32 compatible with ICU 58: ext/intl/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95288@lists.php.net to get a copy of this message | ||
Commit: 0f9a4af90bbaf35db41f2c5c9cfeb239e0576f7e
Author: Anatol Belski <ab@php.net> Wed, 26 Oct 2016 13:05:03 +0200
Parents: af4bfe234caeeb1e59953d130dc7f74a035a2de6
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f9a4af90bbaf35db41f2c5c9cfeb239e0576f7e
Log:
make config.w32 compatible with ICU 58
Changed paths:
M ext/intl/config.w32
Diff:
diff --git a/ext/intl/config.w32 b/ext/intl/config.w32
index 76bd191..5b37d93 100644
--- a/ext/intl/config.w32
+++ b/ext/intl/config.w32
@@ -120,7 +120,16 @@ if (PHP_INTL != "no") {
codepointiterator_methods.cpp ",
"intl");
- ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib icule.lib iculx.lib");
+ 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");
+ }
+
ADD_FLAG("CFLAGS_INTL", "/EHsc");
AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled");
} else {