diff options
| author | Anatol Belski <ab@php.net> | 2018-04-05 14:56:45 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-04-05 14:56:45 +0200 |
| commit | df2e4fd8fc219baae0a43e2eee4dd1ebe6b077fa (patch) | |
| tree | 22f2a45d01ce6050a602d30086e9520b3f726e75 /acinclude.m4 | |
| parent | 50c8d3e0e7b1bd3440513b874b04182b4702679e (diff) | |
| parent | 7768f5e2decfed03515f4bc7cdb3536a3c575a52 (diff) | |
| download | php-git-df2e4fd8fc219baae0a43e2eee4dd1ebe6b077fa.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Rename var
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index be0f9f23f2..c4d0f46e4f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2238,9 +2238,9 @@ AC_DEFUN([PHP_SETUP_ICU],[ PHP_EVAL_INCLINE($ICU_INCS) PHP_EVAL_LIBLINE($ICU_LIBS, $1) - ICU_EXTRA_FLAGS=`$ICU_CONFIG --cxxflags` + ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags` if test "$icu_version" -ge "49000"; then - ICU_EXTRA_FLAGS="$ICU_EXTRA_FLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" + ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" fi fi ]) |