- MFH iconv fixes.

diff --git a/acinclude.m4 b/acinclude.m4
index 739e7636883c979a781942b07f6de4a95a432762..1e44e48424375cbccfcb1b013cfe12ee991654e5 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1200,17 +1200,28 @@ AC_DEFUN(PHP_SETUP_ICONV, [
   found_iconv=no
   unset ICONV_DIR
 
-  AC_CHECK_FUNC(iconv, [
-    AC_DEFINE(HAVE_ICONV, 1, [ ])
-    found_iconv=yes
-  ],[
-    AC_CHECK_FUNC(libiconv,[
-      AC_DEFINE(HAVE_LIBICONV, 1, [ ])
+  dnl
+  dnl Check libc first if no path is provided in --with-iconv
+  dnl
+  if test "$PHP_ICONV" = "yes"; then
+    AC_CHECK_FUNC(iconv, [
       found_iconv=yes
-  ],[
+    ],[
+      AC_CHECK_FUNC(libiconv,[
+        AC_DEFINE(HAVE_LIBICONV, 1, [ ])
+        found_iconv=yes
+      ])
+    ])
+  fi
 
+  dnl
+  dnl Check external libs for iconv funcs
+  dnl
+  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
@@ -1218,11 +1229,11 @@ AC_DEFUN(PHP_SETUP_ICONV, [
         ICONV_DIR=$i
         iconv_lib_name=iconv
         break
-         fi
+      fi
     done
 
     if test -z "$ICONV_DIR"; then
-      AC_MSG_ERROR([Please specify the location of iconv with --with-iconv])
+      AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>])
     fi
   
     if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
@@ -1234,7 +1245,6 @@ AC_DEFUN(PHP_SETUP_ICONV, [
       ], [
         PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
           found_iconv=yes
-          AC_DEFINE(HAVE_ICONV, 1, [ ])
         ], [], [
           -L$ICONV_DIR/lib
         ])
@@ -1242,11 +1252,11 @@ AC_DEFUN(PHP_SETUP_ICONV, [
         -L$ICONV_DIR/lib
       ])
     fi
-  ])
-  ])
-
+  fi
+  
   if test "$found_iconv" = "yes"; then
     if test -n "$ICONV_DIR"; then
+      AC_DEFINE(HAVE_ICONV, 1, [ ])
       PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1)
       PHP_ADD_INCLUDE($ICONV_DIR/include)
     fi

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index ba0a6ab6e839cc96b97d7c06b71af2ca89b9012d..62951671d72edd601ea8409507093546eeccd419 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -27,7 +27,12 @@
 
 #if HAVE_ICONV
 
+#ifdef HAVE_GICONV_H
+#include <giconv.h>
+#else
 #include <iconv.h>
+#endif
+
 #include <errno.h>
 
 #include "php_globals.h"