File tree Expand file tree Collapse file tree 2 files changed +11
-0
lines changed Expand file tree Collapse file tree 2 files changed +11
-0
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,11 @@ PHP NEWS
3
3
?? ??? 2012, PHP 5.3.12
4
4
5
5
?? ??? 2012, PHP 5.3.11
6
+ - Iconv extension:
7
+ . Fixed a bug that iconv extension fails to link to the correct library
8
+ when another extension makes use of a library that links to the iconv
9
+ library. See https://bugs.gentoo.org/show_bug.cgi?id=364139 for detail.
10
+ (Moriyoshi)
6
11
7
12
(merge after 5.3.11 release)
8
13
Original file line number Diff line number Diff line change @@ -2438,7 +2438,12 @@ AC_DEFUN([PHP_SETUP_ICONV], [
2438
2438
dnl
2439
2439
dnl Check libc first if no path is provided in --with-iconv
2440
2440
dnl
2441
+
2441
2442
if test "$PHP_ICONV" = "yes"; then
2443
+ dnl Reset LIBS temporarily as it may have already been included
2444
+ dnl -liconv in.
2445
+ LIBS_save="$LIBS"
2446
+ LIBS=
2442
2447
AC_CHECK_FUNC ( iconv , [
2443
2448
found_iconv=yes
2444
2449
] ,[
@@ -2448,6 +2453,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
2448
2453
found_iconv=yes
2449
2454
] )
2450
2455
] )
2456
+ LIBS="$LIBS_save"
2451
2457
fi
2452
2458
2453
2459
dnl
You can’t perform that action at this time.
0 commit comments