File tree Expand file tree Collapse file tree 2 files changed +3
-13
lines changed Expand file tree Collapse file tree 2 files changed +3
-13
lines changed Original file line number Diff line number Diff line change @@ -1944,12 +1944,7 @@ 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/giconv.h; then
1948
- AC_DEFINE ( HAVE_GICONV_H , 1 , [ ] )
1949
- ICONV_DIR=$i
1950
- iconv_lib_name=giconv
1951
- break
1952
- elif test -r $i/include/iconv.h; then
1947
+ if test -r $i/include/iconv.h; then
1953
1948
ICONV_DIR=$i
1954
1949
iconv_lib_name=iconv
1955
1950
break
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then
15
15
if test "$iconv_avail" != "no"; then
16
16
if test -z "$ICONV_DIR"; then
17
17
for i in /usr/local /usr; do
18
- if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h" ; then
18
+ if test -f "$i/include/iconv.h"; then
19
19
PHP_ICONV_PREFIX="$i"
20
20
break
21
21
fi
@@ -29,12 +29,7 @@ if test "$PHP_ICONV" != "no"; then
29
29
30
30
CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
31
31
LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
32
-
33
- if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
34
- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
35
- else
36
- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
37
- fi
32
+ PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
38
33
39
34
AC_MSG_CHECKING ( [ if iconv is glibc's] )
40
35
AC_LINK_IFELSE ( [ AC_LANG_PROGRAM ( [ [ #include <gnu/libc-version.h>] ] , [ [ gnu_get_libc_version();] ] ) ] ,[
You can’t perform that action at this time.
0 commit comments