From a00abb68500ed4fa1d1df2cd761c7ec99ebefdb0 Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Thu, 31 Oct 2002 20:23:53 +0000
Subject: [PATCH] Fixed library capability detection behaviour. # Whew! I've
 fixed all the known problems. # And should I become a maintainer of this
 module?

---
 ext/iconv/config.m4 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index 5e2b47245d..37f82eb479 100644
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -14,7 +14,8 @@ if test "$PHP_ICONV" != "no"; then
   ])
 
   if test "$iconv_avail" != "no"; then
-
+    iconv_cflags_save="$CFLAGS"
+    CFLAGS="$CFLAGS $INCLUDES"
     AC_MSG_CHECKING([if iconv supports errno])
     AC_TRY_RUN([
 #define LIBICONV_PLUG
@@ -107,6 +108,8 @@ int main() {
         ;;
     esac
 
+    CFLAGS="$iconv_cflags_save"
+
     PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared)
     PHP_SUBST(ICONV_SHARED_LIBADD)
   else
-- 
2.50.1