diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-04-17 08:12:02 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-04-17 08:12:02 +0100 |
| commit | f69c1082498569dcab95706ce1f6b9c2ac07f367 (patch) | |
| tree | 9f3da42f9fae5d6fb065beeefe55841e526891dc | |
| parent | bc3c9a06e03730594bcc2d4d26ff96965e27f040 (diff) | |
| parent | 32c5b8efd68dd21dd025285e7207dcab7c6319cd (diff) | |
| download | php-git-f69c1082498569dcab95706ce1f6b9c2ac07f367.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
ext/gettext: respect passed in library directory for all checks
| -rw-r--r-- | ext/gettext/config.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4 index 24dddd3a43..c82be9cc05 100644 --- a/ext/gettext/config.m4 +++ b/ext/gettext/config.m4 @@ -30,7 +30,6 @@ if test "$PHP_GETTEXT" != "no"; then AC_MSG_ERROR(Unable to find required gettext library) ]) ) - LDFLAGS=$O_LDFLAGS AC_DEFINE(HAVE_LIBINTL,1,[ ]) PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared) @@ -46,5 +45,6 @@ if test "$PHP_GETTEXT" != "no"; then AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dngettext, [AC_DEFINE(HAVE_DNGETTEXT, 1, [ ])]) 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 fi |