From a6c95c8a00e9286ccc662e9682f9254e153d6833 Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <mozo@mozo.jp>
Date: Tue, 3 Apr 2012 01:32:42 +0900
Subject: [PATCH] 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.
---
NEWS | 5 +++++
acinclude.m4 | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/NEWS b/NEWS
index c7cd2c7c40..736ffe813a 100644
--- a/NEWS
+++ b/NEWS
@@ -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
--
2.40.0