diff options
| author | Moriyoshi Koizumi <mozo@mozo.jp> | 2012-04-03 01:32:42 +0900 |
|---|---|---|
| committer | Moriyoshi Koizumi <mozo@mozo.jp> | 2012-04-03 01:51:23 +0900 |
| commit | a6c95c8a00e9286ccc662e9682f9254e153d6833 (patch) | |
| tree | 9b3ec2c04056c521b76bb068528fc30b1032f882 | |
| parent | 8684fb7facd8f5c1589996c1ebfd782f77c245ff (diff) | |
| download | php-git-a6c95c8a00e9286ccc662e9682f9254e153d6833.tar.gz | |
Reset LIBS temporarily to make sure PHP_CHECK_FUNC will look into libc.
See Gentoo bug #364139. https://bugs.gentoo.org/show_bug.cgi?id=364139
Reported by Naohiro Aota.
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | acinclude.m4 | 6 |
2 files changed, 11 insertions, 0 deletions
@@ -3,6 +3,11 @@ PHP NEWS ?? ??? 2012, PHP 5.3.12 ?? ??? 2012, PHP 5.3.11 +- Iconv extension: + . Fixed a bug that iconv extension fails to link to the correct library + when another extension makes use of a library that links to the iconv + library. See https://bugs.gentoo.org/show_bug.cgi?id=364139 for detail. + (Moriyoshi) (merge after 5.3.11 release) diff --git a/acinclude.m4 b/acinclude.m4 index 5515b3f03d..ddf7285783 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2438,7 +2438,12 @@ AC_DEFUN([PHP_SETUP_ICONV], [ dnl dnl Check libc first if no path is provided in --with-iconv dnl + if test "$PHP_ICONV" = "yes"; then + dnl Reset LIBS temporarily as it may have already been included + dnl -liconv in. + LIBS_save="$LIBS" + LIBS= AC_CHECK_FUNC(iconv, [ found_iconv=yes ],[ @@ -2448,6 +2453,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ found_iconv=yes ]) ]) + LIBS="$LIBS_save" fi dnl |