Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	NEWS
  • Loading branch information...
commit 43047598c4e4ed76daa82ff509e46c40087f0ea4 2 parents 374646c + a6c95c8
@moriyoshi moriyoshi authored
Showing with 6 additions and 0 deletions.
  1. +6 −0 acinclude.m4
View
6 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
Please sign in to comment.
Something went wrong with that request. Please try again.