From 0f557756dd3bb7a6390894e04f9ca25333c88d67 Mon Sep 17 00:00:00 2001 From: sji Date: Thu, 12 Jul 2018 22:23:47 +0900 Subject: [PATCH] Fixed incorrect restoring of LDFLAGS --- ext/gettext/config.m4 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 index c82be9cc057..59a6d077de2 100644 --- a/ext/gettext/config.m4 +++ b/ext/gettext/config.m4 @@ -35,10 +35,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, [ ])]) @@ -47,4 +43,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