1From a04aabc5b80371e579fbaffdd417627390d22722 Mon Sep 17 00:00:00 2001
2From: Claude Bing <cbing@cybernetics.com>
3Date: Tue, 9 Nov 2021 13:10:33 -0500
4Subject: [PATCH 10/11] iconv: fix detection
5
6Upstream-Status: Pending
7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9
10update patch to version 7.4.4
11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12
13update patch to version 8.0.12
14Signed-off-by: Claude Bing <cbing@cybernetics.com>
15---
16 build/php.m4 | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19diff --git a/build/php.m4 b/build/php.m4
20index 93551d9ca7..dba50825fb 100644
21--- a/build/php.m4
22+++ b/build/php.m4
23@@ -1919,7 +1919,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
24   unset ICONV_DIR
25
26   dnl Check libc first if no path is provided in --with-iconv.
27-  if test "$PHP_ICONV" = "yes"; then
28+  dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes
29+  if test "$PHP_ICONV" != "no"; then
30     dnl Reset LIBS temporarily as it may have already been included -liconv in.
31     LIBS_save="$LIBS"
32     LIBS=
33--
342.25.1
35
36