Skip to content

Commit 2d35974

Browse files
committed
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
1 parent 6559284 commit 2d35974

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

build/php.m4

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,12 +1944,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
19441944
if test "$found_iconv" = "no"; then
19451945
19461946
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
19531948
ICONV_DIR=$i
19541949
iconv_lib_name=iconv
19551950
break

ext/iconv/config.m4

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then
1515
if test "$iconv_avail" != "no"; then
1616
if test -z "$ICONV_DIR"; then
1717
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
1919
PHP_ICONV_PREFIX="$i"
2020
break
2121
fi
@@ -29,12 +29,7 @@ if test "$PHP_ICONV" != "no"; then
2929

3030
CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
3131
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"
3833

3934
AC_MSG_CHECKING([if iconv is glibc's])
4035
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnu/libc-version.h>]], [[gnu_get_libc_version();]])],[

0 commit comments

Comments
 (0)