summaryrefslogtreecommitdiff
path: root/build/php.m4
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-08-07 16:05:24 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-08-07 17:03:41 +0200
commit2d359749a47f5e417364d8c410c8a6b06def2921 (patch)
treed9db65f987ee226919af7e7673e4e5af41694083 /build/php.m4
parent65592840f05ef1e96622b5b48a55928893617629 (diff)
downloadphp-git-2d359749a47f5e417364d8c410c8a6b06def2921.tar.gz
Remove giconv support
The best information I was able to find about this is this mail from 2009 which indicates that giconv is an old FreeBSD iconv implementation that has long since been superseded by libiconv. https://lists.samba.org/archive/samba-technical/2009-June/065177.html
Diffstat (limited to 'build/php.m4')
-rw-r--r--build/php.m47
1 files changed, 1 insertions, 6 deletions
diff --git a/build/php.m4 b/build/php.m4
index 70a7e34d93..b827679b3e 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -1944,12 +1944,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
if test "$found_iconv" = "no"; then
for i in $PHP_ICONV /usr/local /usr; do
- if test -r $i/include/giconv.h; then
- AC_DEFINE(HAVE_GICONV_H, 1, [ ])
- ICONV_DIR=$i
- iconv_lib_name=giconv
- break
- elif test -r $i/include/iconv.h; then
+ if test -r $i/include/iconv.h; then
ICONV_DIR=$i
iconv_lib_name=iconv
break