Merge branch 'PHP-7.2'

* PHP-7.2:
  Rename var

diff --cc acinclude.m4
index be0f9f23f2e61f953ddc42e23c79930b5cbd3ae7,1a692b72f4a710146189f98117f455eda7d1d1d5..c4d0f46e4fbc1534b61952d512d5c1c0d2f885f4
--- 1/acinclude.m4
--- 2/acinclude.m4
+++ b/acinclude.m4
@@@ -2238,10 -2238,8 +2238,10 @@@ 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`
 -    ICU_CXXFLAGS="$ICU_CXXFLAGS -DU_USING_ICU_NAMESPACE=1"
 +    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
  ])