Subject: [PATCH] From 17cc5645f3acf943a5a06465d09d0ebcfea987bd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 2 Nov 2011 16:54:57 +0100 Subject: [PATCH] Upstream-Status: Pending update patch to version 7.4.4 Signed-off-by: Changqing Li --- build/php.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/php.m4 b/build/php.m4 index 93551d9c..dba50825 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -1919,7 +1919,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ unset ICONV_DIR dnl Check libc first if no path is provided in --with-iconv. - if test "$PHP_ICONV" = "yes"; then + dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes + if test "$PHP_ICONV" != "no"; then dnl Reset LIBS temporarily as it may have already been included -liconv in. LIBS_save="$LIBS" LIBS= -- 2.25.1