diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-08-05 20:32:05 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-08-05 20:32:05 +0200 |
| commit | 024232e94dc18c02459f80848998515a41ee6e5c (patch) | |
| tree | 81345bc6b1284c9ae6b1af6e9779b2dbef1b054d | |
| parent | a003af5b62f802da5e1e0563741284cb5e622957 (diff) | |
| parent | 8d91e82871a96be9a15ef94fd729ed6d5c443e49 (diff) | |
| download | php-git-024232e94dc18c02459f80848998515a41ee6e5c.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed incorrect restoring of LDFLAGS
| -rw-r--r-- | ext/gettext/config.m4 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 index b1b53601aa..63691e61f9 100644 --- a/ext/gettext/config.m4 +++ b/ext/gettext/config.m4 @@ -33,10 +33,6 @@ if test "$PHP_GETTEXT" != "no"; then PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared) PHP_SUBST(GETTEXT_SHARED_LIBADD) - if test -n "$GETTEXT_LIBS"; then - PHP_ADD_LIBRARY_WITH_PATH($GETTEXT_LIBS, $GETTEXT_LIBDIR, GETTEXT_SHARED_LIBADD) - fi - PHP_ADD_INCLUDE($GETTEXT_INCDIR) AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, ngettext, [AC_DEFINE(HAVE_NGETTEXT, 1, [ ])]) @@ -45,4 +41,7 @@ if test "$PHP_GETTEXT" != "no"; then 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 |