diff options
| author | Moriyoshi Koizumi <mozo@mozo.jp> | 2012-04-03 02:00:23 +0900 |
|---|---|---|
| committer | Moriyoshi Koizumi <mozo@mozo.jp> | 2012-04-03 02:00:23 +0900 |
| commit | 43047598c4e4ed76daa82ff509e46c40087f0ea4 (patch) | |
| tree | 3a7b0b937f97701e8bc41a80024a9a49b4be0ebd /acinclude.m4 | |
| parent | 374646c36b07956da928e0583854002e55b4013e (diff) | |
| parent | a6c95c8a00e9286ccc662e9682f9254e153d6833 (diff) | |
| download | php-git-43047598c4e4ed76daa82ff509e46c40087f0ea4.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
NEWS
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e1842bb5aa..adb9599ce4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2449,7 +2449,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 ],[ @@ -2459,6 +2464,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ found_iconv=yes ]) ]) + LIBS="$LIBS_save" fi dnl |