File tree 1 file changed +8
-2
lines changed
1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -1944,8 +1944,14 @@ AC_DEFUN([PHP_SETUP_ICONV], [
1944
1944
if test "$found_iconv" = "no"; then
1945
1945
1946
1946
for i in $PHP_ICONV /usr/local /usr; do
1947
- if test -r $i/include/iconv.h; then
1947
+ if test -r $i/include/gnu-libiconv/ iconv.h; then
1948
1948
ICONV_DIR=$i
1949
+ ICONV_INCLUDE_DIR=$i/include/gnu-libiconv
1950
+ iconv_lib_name=iconv
1951
+ break
1952
+ elif test -r $i/include/iconv.h; then
1953
+ ICONV_DIR=$i
1954
+ ICONV_INCLUDE_DIR=$i/include
1949
1955
iconv_lib_name=iconv
1950
1956
break
1951
1957
fi
@@ -1979,7 +1985,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
1979
1985
AC_DEFINE ( HAVE_ICONV ,1 ,[ ] )
1980
1986
if test -n "$ICONV_DIR"; then
1981
1987
PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1 )
1982
- PHP_ADD_INCLUDE($ICONV_DIR/include )
1988
+ PHP_ADD_INCLUDE($ICONV_INCLUDE_DIR )
1983
1989
fi
1984
1990
$2
1985
1991
ifelse ( [ $3 ] ,[ ] ,,[ else $3 ] )
You can’t perform that action at this time.
0 commit comments