Index: ext/iconv/.cvsignore
===================================================================
RCS file: /repository/php-src/ext/iconv/.cvsignore,v
retrieving revision 1.8
diff -u -r1.8 .cvsignore
--- ext/iconv/.cvsignore	15 Dec 2004 02:29:40 -0000	1.8
+++ ext/iconv/.cvsignore	4 Dec 2007 09:40:27 -0000
@@ -48,6 +48,7 @@
 *.gcda
 *.gcno
 php_have_bsd_iconv.h
+php_have_ibm_iconv.h
 php_have_libiconv.h
 php_php_iconv_h_path.h
 php_have_glibc_iconv.h  
Index: ext/iconv/config.m4
===================================================================
RCS file: /repository/php-src/ext/iconv/config.m4,v
retrieving revision 1.33.2.4.2.1
diff -u -r1.33.2.4.2.1 config.m4
--- ext/iconv/config.m4	1 Mar 2007 11:29:43 -0000	1.33.2.4.2.1
+++ ext/iconv/config.m4	4 Dec 2007 09:40:27 -0000
@@ -79,9 +79,21 @@
       ])
     fi
 
+    if test -z "$iconv_impl_name"; then
+      AC_MSG_CHECKING([if using IBM iconv])
+      AC_TRY_LINK([#include <iconv.h>],[cstoccsid("");],
+      [
+        AC_MSG_RESULT(yes)
+        iconv_impl_name="ibm"
+      ],[
+        AC_MSG_RESULT(no)
+      ])
+    fi
+
     echo > ext/iconv/php_have_bsd_iconv.h
     echo > ext/iconv/php_have_glibc_iconv.h
     echo > ext/iconv/php_have_libiconv.h
+    echo > ext/iconv/php_have_ibm_iconv.h
 
     case "$iconv_impl_name" in
       gnu_libiconv [)]
@@ -104,6 +116,12 @@
         PHP_DEFINE([PHP_ICONV_IMPL],[\"glibc\"],[ext/iconv])
         AC_DEFINE([PHP_ICONV_IMPL],["glibc"],[Which iconv implementation to use])
         ;;
+      ibm [)]
+        PHP_DEFINE([HAVE_IBM_ICONV],1,[ext/iconv])
+        AC_DEFINE([HAVE_IBM_ICONV],1,[IBM iconv implementation])
+        PHP_DEFINE([PHP_ICONV_IMPL],[\"IBM iconv\"],[ext/iconv])
+        AC_DEFINE([PHP_ICONV_IMPL],["IBM iconv"],[Which iconv implementation to use])
+        ;;
     esac
 
     AC_MSG_CHECKING([if iconv supports errno])
Index: ext/iconv/php_iconv.h
===================================================================
RCS file: /repository/php-src/ext/iconv/php_iconv.h,v
retrieving revision 1.28.2.2.2.2
diff -u -r1.28.2.2.2.2 php_iconv.h
--- ext/iconv/php_iconv.h	19 Sep 2007 00:30:52 -0000	1.28.2.2.2.2
+++ ext/iconv/php_iconv.h	4 Dec 2007 09:40:27 -0000
@@ -37,6 +37,7 @@
 #include "ext/iconv/php_have_libiconv.h"
 #include "ext/iconv/php_have_glibc_iconv.h"
 #include "ext/iconv/php_have_bsd_iconv.h"
+#include "ext/iconv/php_have_ibm_iconv.h"
 #include "ext/iconv/php_iconv_supports_errno.h"
 #include "ext/iconv/php_php_iconv_impl.h"
 #include "ext/iconv/php_php_iconv_h_path.h"