merge 295848 by Philip's request

tony2001 · tony2001 · commit 392a27e96515 · 2010-04-02T08:07:16.000Z
diff --git a/acinclude.m4 b/acinclude.m4
@@ -2424,6 +2424,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
   echo > ext/iconv/php_have_libiconv.h
   echo > ext/iconv/php_have_iconv.h
   echo > ext/iconv/php_php_iconv_impl.h
+  echo > ext/iconv/php_have_libiconv_in_libiconv.h
   echo > ext/iconv/php_php_iconv_h_path.h
   echo > ext/iconv/php_iconv_supports_errno.h
 
@@ -2471,6 +2472,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
         found_iconv=yes
         PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
         AC_DEFINE(HAVE_LIBICONV,1,[ ])
+        PHP_DEFINE([HAVE_LIBICONV_IN_LIBICONV],1,[ext/iconv])
+        AC_DEFINE([HAVE_LIBICONV_IN_LIBICONV],1,[iconv() is aliased to libiconv() in -liconv])
       ], [
         PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
           found_iconv=yes
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
@@ -182,7 +182,7 @@ static PHP_GINIT_FUNCTION(iconv)
 }
 /* }}} */
 
-#ifdef HAVE_LIBICONV
+#if defined(HAVE_LIBICONV) && defined(HAVE_LIBICONV_IN_LIBICONV)
 #define iconv libiconv
 #endif
 
diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
@@ -37,6 +37,7 @@
 #ifdef PHP_ATOM_INC
 #include "ext/iconv/php_have_iconv.h"
 #include "ext/iconv/php_have_libiconv.h"
+#include "ext/iconv/php_have_libiconv_in_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"

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ static PHP_GINIT_FUNCTION(iconv)`
`182`	`182`	`}`
`183`	`183`	`/* }}} */`
`184`	`184`
`185`		`-#ifdef HAVE_LIBICONV`
	`185`	`+#if defined(HAVE_LIBICONV) && defined(HAVE_LIBICONV_IN_LIBICONV)`
`186`	`186`	`#define iconv libiconv`
`187`	`187`	`#endif`
`188`	`188`