com php-src: Fixed incorrect restoring of LDFLAGS: ext/gettext/config.m4
| From: | Peter Kokot | Date: | Sun, 05 Aug 2018 18:26:40 +0000 |
| Subject: | com php-src: Fixed incorrect restoring of LDFLAGS: ext/gettext/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102824@lists.php.net to get a copy of this message | ||
Commit: 0f557756dd3bb7a6390894e04f9ca25333c88d67
Author: sji <shinji.igarashi@gmail.com> Thu, 12 Jul 2018 22:23:47 +0900
Committer: Peter Kokot <peterkokot@gmail.com> Sun, 5 Aug 2018 20:26:40 +0200
Parents: fd0fc20d35d77728a434195210ba01cf5692cc77
Branches: PHP-7.1 PHP-7.2 PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f557756dd3bb7a6390894e04f9ca25333c88d67
Log:
Fixed incorrect restoring of LDFLAGS
Changed paths:
M ext/gettext/config.m4
Diff:
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
index c82be9c..59a6d07 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