Patch acinclude_m4.patch for Compile Failure Bug #53442

Patch version 2010-12-01 21:52 UTC

Obsoleted by patches:

• acinclude_m4_v2.patch, revision 2010-12-01 22:05 UTC

• 2010-12-01 21:52 UTC [diff to current]

Developer: fransmeulenbroeks@gmail.com

Index: php-5.2.13/acinclude.m4
===================================================================
--- php-5.2.13.orig/acinclude.m4
+++ php-5.2.13/acinclude.m4
@@ -2430,7 +2430,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
   dnl
   dnl Check libc first if no path is provided in --with-iconv
   dnl
-  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
     AC_CHECK_FUNC(iconv, [
       found_iconv=yes
     ],[