Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed incorrect restoring of LDFLAGS

diff --cc ext/gettext/config.m4
index b1b53601aa45f51828a71b44776a03fe93270677,59a6d077de263cb879164acf7b6cd4d9f1038fa4..63691e61f9f390bc90395c8a1e9f5f59c0aead5e
--- 1/ext/gettext/config.m4
--- 2/ext/gettext/config.m4
+++ b/ext/gettext/config.m4
@@@ -44,5 -42,8 +40,8 @@@ if test "$PHP_GETTEXT" != "no"; the
    AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dcngettext,  [AC_DEFINE(HAVE_DCNGETTEXT, 1, [ ])])
    AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, bind_textdomain_codeset,  [AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET, 1, [ ])])
    LDFLAGS=$O_LDFLAGS
 -  
 +
+   if test -n "$GETTEXT_LIBS"; then
+     PHP_ADD_LIBRARY_WITH_PATH($GETTEXT_LIBS, $GETTEXT_LIBDIR, GETTEXT_SHARED_LIBADD)
+   fi
  fi