com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/gettext/config.m4

From: Date: Sun, 05 Aug 2018 18:32:05 +0000
Subject: com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/gettext/config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-102820@lists.php.net to get a copy of this message
Commit: 024232e94dc18c02459f80848998515a41ee6e5c Author: Peter Kokot <peterkokot@gmail.com> Sun, 5 Aug 2018 20:32:05 +0200 Parents: a003af5b62f802da5e1e0563741284cb5e622957 8d91e82871a96be9a15ef94fd729ed6d5c443e49 Branches: PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=024232e94dc18c02459f80848998515a41ee6e5c Log: Merge branch 'PHP-7.2' into PHP-7.3 * PHP-7.2: Fixed incorrect restoring of LDFLAGS Changed paths: MM ext/gettext/config.m4 Diff: diff --cc ext/gettext/config.m4 index b1b5360,59a6d07..63691e6 --- a/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

« previous php.cvs (#102820) next »