diff options
| author | Antony Dovgal <tony2001@php.net> | 2010-04-02 08:07:16 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2010-04-02 08:07:16 +0000 |
| commit | 392a27e96515d52deaa5c72356818cac358a8e52 (patch) | |
| tree | f240dc7e8b3b355bb5e8633e15a1cf7eca1d1db2 | |
| parent | 997ff7a4e0fd6381e0f765a0f135e2865195912b (diff) | |
| download | php-git-392a27e96515d52deaa5c72356818cac358a8e52.tar.gz | |
merge 295848 by Philip's request
| -rw-r--r-- | acinclude.m4 | 3 | ||||
| -rw-r--r-- | ext/iconv/iconv.c | 2 | ||||
| -rw-r--r-- | ext/iconv/php_iconv.h | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index f022a8a75d..0d5eda2dbf 100644 --- 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 index c3b392c6f4..185f6c4aeb 100644 --- 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 index 98743d8f13..5237941b44 100644 --- 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" |