From: Anatol Belski <ab@php.net>
Date: Wed, 26 Oct 2016 11:05:03 +0000 (+0200)
Subject: make config.w32 compatible with ICU 58
X-Git-Tag: php-7.1.0RC6~61^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f9a4af90bbaf35db41f2c5c9cfeb239e0576f7e;p=php

make config.w32 compatible with ICU 58
---

diff --git a/ext/intl/config.w32 b/ext/intl/config.w32
index 76bd19177b..5b37d934bd 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 {