svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/acinclude.m4 branches/PHP_5_2/ext/iconv/iconv.c branches/PHP_5_2/ext/iconv/php_iconv.h
branches/PHP_5_3/acinclude.m4 branches/PHP_5_3/ext/iconv/iconv.c branches/PHP_5_3/ext/iconv/php_iconv.h trunk/acinclude.m4 trunk/ext/iconv/iconv.c
trunk/ext/iconv/php_iconv.h
| From: | Moriyoshi Koizumi | Date: | Fri, 05 Mar 2010 09:12:13 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/acinclude.m4 branches/PHP_5_2/ext/iconv/iconv.c branches/PHP_5_2/ext/iconv/php_iconv.h branches/PHP_5_3/acinclude.m4 branches/PHP_5_3/ext/iconv/iconv.c branches/PHP_5_3/ext/iconv/php_iconv.h trunk/acinclude.m4 trunk/ext/iconv/iconv.c trunk/ext/iconv/php_iconv.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61970@lists.php.net to get a copy of this message | ||
moriyoshi Fri, 05 Mar 2010 09:12:13 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=295848
Log:
- Fixed bug #49267 (linking fails for iconv)
Bug: http://bugs.php.net/49267 (No Feedback) Linking fails
for iconv: "Undefined symbols: _libiconv"
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/acinclude.m4
U php/php-src/branches/PHP_5_2/ext/iconv/iconv.c
U php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h
U php/php-src/branches/PHP_5_3/acinclude.m4
U php/php-src/branches/PHP_5_3/ext/iconv/iconv.c
U php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h
U php/php-src/trunk/acinclude.m4
U php/php-src/trunk/ext/iconv/iconv.c
U php/php-src/trunk/ext/iconv/php_iconv.h
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-03-05 09:12:13 UTC (rev 295848)
@@ -11,6 +11,7 @@
an invalid option is provided). (Ilia)
- Fixed bug #51086 (DBA DB4 doesn't work with Berkeley DB 4.8). (Chris Jones)
- Fixed bug #51062 (DBA DB4 uses mismatched headers and libraries). (Chris Jones)
+- Fixed bug #49267 (Linking fails for iconv). (Moriyosh)
- Fixed bug #43314 (iconv_mime_encode(), broken Q scheme). (Rasmus)
- Fixed bug #23229 (syslog function truncates messages). (Adam)
Modified: php/php-src/branches/PHP_5_2/acinclude.m4
===================================================================
--- php/php-src/branches/PHP_5_2/acinclude.m4 2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/branches/PHP_5_2/acinclude.m4 2010-03-05 09:12:13 UTC (rev 295848)
@@ -2424,6 +2424,7 @@
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 @@
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
Modified: php/php-src/branches/PHP_5_2/ext/iconv/iconv.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/iconv/iconv.c 2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/branches/PHP_5_2/ext/iconv/iconv.c 2010-03-05 09:12:13 UTC (rev 295848)
@@ -193,7 +193,7 @@
}
/* }}} */
-#ifdef HAVE_LIBICONV
+#if defined(HAVE_LIBICONV) && defined(HAVE_LIBICONV_IN_LIBICONV)
#define iconv libiconv
#endif
Modified: php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h
===================================================================
--- php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h 2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/branches/PHP_5_2/ext/iconv/php_iconv.h 2010-03-05 09:12:13 UTC (rev 295848)
@@ -35,6 +35,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_iconv_supports_errno.h"
Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===================================================================
--- php/php-src/branches/PHP_5_3/acinclude.m4 2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/branches/PHP_5_3/acinclude.m4 2010-03-05 09:12:13 UTC (rev 295848)
@@ -2424,6 +2424,7 @@
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 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/iconv/iconv.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/iconv/iconv.c 2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/branches/PHP_5_3/ext/iconv/iconv.c 2010-03-05 09:12:13 UTC (rev 295848)
@@ -182,7 +182,7 @@
}
/* }}} */
-#ifdef HAVE_LIBICONV
+#if defined(HAVE_LIBICONV) && defined(HAVE_LIBICONV_IN_LIBICONV)
#define iconv libiconv
#endif
Modified: php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h 2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/branches/PHP_5_3/ext/iconv/php_iconv.h 2010-03-05 09:12:13 UTC (rev 295848)
@@ -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"
Modified: php/php-src/trunk/acinclude.m4
===================================================================
--- php/php-src/trunk/acinclude.m4 2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/trunk/acinclude.m4 2010-03-05 09:12:13 UTC (rev 295848)
@@ -2424,6 +2424,7 @@
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 @@
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
Modified: php/php-src/trunk/ext/iconv/iconv.c
===================================================================
--- php/php-src/trunk/ext/iconv/iconv.c 2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/trunk/ext/iconv/iconv.c 2010-03-05 09:12:13 UTC (rev 295848)
@@ -176,7 +176,7 @@
}
/* }}} */
-#ifdef HAVE_LIBICONV
+#if defined(HAVE_LIBICONV) && defined(HAVE_LIBICONV_IN_LIBICONV)
#define iconv libiconv
#endif
Modified: php/php-src/trunk/ext/iconv/php_iconv.h
===================================================================
--- php/php-src/trunk/ext/iconv/php_iconv.h 2010-03-05 06:45:28 UTC (rev 295847)
+++ php/php-src/trunk/ext/iconv/php_iconv.h 2010-03-05 09:12:13 UTC (rev 295848)
@@ -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"