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

diff --git a/build/php.m4 b/build/php.m4
index 70a7e34d93379380c0442d1791e4587c6cb170bd..b827679b3e6921fb59f8bca8ea2ec89c17cdfb20 100644 (file)
--- 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

diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index 59b89824bfbd23d2af7dccae28c59e88dc1797e2..0588f1ba310cbc70a382d563f27caef44fa0edd7 100644 (file)
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then
   if test "$iconv_avail" != "no"; then
     if test -z "$ICONV_DIR"; then
       for i in /usr/local /usr; do
-        if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
+        if test -f "$i/include/iconv.h"; then
           PHP_ICONV_PREFIX="$i"
           break
         fi
@@ -29,12 +29,7 @@ if test "$PHP_ICONV" != "no"; then
 
     CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
     LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
-
-    if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
-      PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
-    else
-      PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
-       fi
+    PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
 
     AC_MSG_CHECKING([if iconv is glibc's])
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnu/libc-version.h>]], [[gnu_get_libc_version();]])],[