Skip to content

Commit 32c5b8e

Browse files
mheikrakjoe
authored andcommitted
ext/gettext: respect passed in library directory for all checks
A directory given to configure by --with-gettext=dir is only used within the very first AC_CHECK_LIB. This is because the temporary modified LDFLAGS variable is reset too early. This results in functions not detected properly. The original issue and patch was reported for OpenWrt/LEDE distribution by @Dimazhan at: openwrt/packages#4250 Signed-off-by: Michael Heimpold <[email protected]>
1 parent 618d979 commit 32c5b8e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ext/gettext/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ if test "$PHP_GETTEXT" != "no"; then
3030
AC_MSG_ERROR(Unable to find required gettext library)
3131
])
3232
)
33-
LDFLAGS=$O_LDFLAGS
3433

3534
AC_DEFINE(HAVE_LIBINTL,1,[ ])
3635
PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared)
@@ -46,5 +45,6 @@ if test "$PHP_GETTEXT" != "no"; then
4645
AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dngettext, [AC_DEFINE(HAVE_DNGETTEXT, 1, [ ])])
4746
AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dcngettext, [AC_DEFINE(HAVE_DCNGETTEXT, 1, [ ])])
4847
AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, bind_textdomain_codeset, [AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET, 1, [ ])])
48+
LDFLAGS=$O_LDFLAGS
4949

5050
fi

0 commit comments

Comments
 (0)