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