diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2010-03-05 09:12:13 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2010-03-05 09:12:13 +0000 |
| commit | f4c1f9b15935f98d6c2bc48b0f44754d25d94d5e (patch) | |
| tree | fc350946ccd767e09694bf9e5895f70a04ad6087 | |
| parent | 9de8fffb949159512dd3c8920150c8985f56757e (diff) | |
| download | php-git-f4c1f9b15935f98d6c2bc48b0f44754d25d94d5e.tar.gz | |
- Fixed bug #49267 (linking fails for iconv)
| -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 45d04cadd6..f6cf1ca6de 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 8ecdb5dac3..c85b0a21a6 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -176,7 +176,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 de051472ad..ff65167c2c 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" |