archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fixed bug #49267 (linking fails for iconv)

Browse source
This commit is contained in:
Moriyoshi Koizumi 2010-03-05 09:12:13 +00:00
parent 9de8fffb94
commit f4c1f9b159
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
acinclude.m4
View file

@ -2424,6 +2424,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
echo > ext/iconv/php_have_libiconv.h echo > ext/iconv/php_have_libiconv.h
echo > ext/iconv/php_have_iconv.h echo > ext/iconv/php_have_iconv.h
echo > ext/iconv/php_php_iconv_impl.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_php_iconv_h_path.h
echo > ext/iconv/php_iconv_supports_errno.h echo > ext/iconv/php_iconv_supports_errno.h
@ -2471,6 +2472,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
found_iconv=yes found_iconv=yes
PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv]) PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
AC_DEFINE(HAVE_LIBICONV,1,[ ]) 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, [ PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
found_iconv=yes found_iconv=yes

2
ext/iconv/iconv.c
View file

@ -176,7 +176,7 @@ static PHP_GINIT_FUNCTION(iconv)
} }
/* }}} */ /* }}} */
#ifdef HAVE_LIBICONV #if defined(HAVE_LIBICONV) && defined(HAVE_LIBICONV_IN_LIBICONV)
#define iconv libiconv #define iconv libiconv
#endif #endif

1
ext/iconv/php_iconv.h
View file

@ -37,6 +37,7 @@
#ifdef PHP_ATOM_INC #ifdef PHP_ATOM_INC
#include "ext/iconv/php_have_iconv.h" #include "ext/iconv/php_have_iconv.h"
#include "ext/iconv/php_have_libiconv.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_glibc_iconv.h"
#include "ext/iconv/php_have_bsd_iconv.h" #include "ext/iconv/php_have_bsd_iconv.h"
#include "ext/iconv/php_have_ibm_iconv.h" #include "ext/iconv/php_have_ibm_iconv.h"