1From 1357df0196806d5697b1f84497ef72aab5faa8a3 Mon Sep 17 00:00:00 2001 2From: Gustavo Zacarias <gustavo@zacarias.com.ar> 3Date: Tue, 9 Aug 2016 11:50:49 +0200 4Subject: [PATCH] iconv: tweak iconv detection 5 6Tweak PHP_SETUP_ICONV from aclocal/build/php.m4 to not 7PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use 8test instead of AC_TRY_LINK to find headers which is bad, 9specially when adding /usr and /usr/local to the mix. 10Do basically the same with ext/iconv/config.m4 by tweaking 11PHP_ICONV_H_PATH which, again, uses test and absolute paths. 12 13Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> 14[Gustavo: convert to nice m4 instead of patching configure] 15[Gustavo: update for 5.6.10] 16Signed-off-by: Adam Duskett <aduskett@gmail.com> 17[aduskett@gmail.com: Update for 8.0.7] 18Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 19[Bernd: rebased for 7.4.10 & 7.4.13] 20--- 21 build/php.m4 | 2 +- 22 1 file changed, 1 insertion(+), 1 deletion(-) 23 24diff --git a/build/php.m4 b/build/php.m4 25index 9586c490..8b3d47ed 100644 26--- a/build/php.m4 27+++ b/build/php.m4 28@@ -1937,7 +1937,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ 29 dnl Check external libs for iconv funcs. 30 if test "$found_iconv" = "no"; then 31 32- for i in $PHP_ICONV /usr/local /usr; do 33+ for i in $PHP_ICONV; do 34 if test -r $i/include/gnu-libiconv/iconv.h; then 35 ICONV_DIR=$i 36 ICONV_INCLUDE_DIR=$i/include/gnu-libiconv 37-- 382.31.1 39 40