* MFH: yet another iconv fix

diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index 447ddc3cffd4b4243361b7a79817bab3ccd323d5..b636ffbdabc8830ad01d39c7541d53a7ce4edcfd 100644 (file)
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -7,36 +7,33 @@ PHP_ARG_WITH(iconv, for iconv support,
 
 if test "$PHP_ICONV" != "no"; then
 
-dnl This is a fix for why FreeBSD does not work with ICONV
-dnl It seems libtool checks for libiconv_open which only exists in
-dnl the giconv series of files under FreeBSD
-
-  ac_os_uname=`uname -s 2>/dev/null`
-
-  if test "$ac_os_uname" = "FreeBSD"; then
-       lib_name=giconv
-  else
-       lib_name=iconv
-  fi
-
-  for i in /usr /usr/local $PHP_ICONV; do
-    test -r $i/include/${lib_name}.h && ICONV_DIR=$i
+  iconv_lib_name=iconv
+  for i in $PHP_ICONV /usr/local /usr; do
+    if test -r $i/include/giconv.h || test -r $i/include/iconv.h; then
+      ICONV_DIR=$i
+      if test -r $i/include/giconv.h; then
+        iconv_lib_name=giconv
+      fi
+      break
+    fi
   done
 
   if test -z "$ICONV_DIR"; then
     AC_MSG_ERROR(Please reinstall the iconv library.)
   fi
   
-  if test -f $ICONV_DIR/lib/libiconv.a -o -f $ICONV_DIR/lib/lib${lib_name}.$SHLIB_SUFFIX_NAME ; then
-    PHP_ADD_LIBRARY_WITH_PATH(iconv, $ICONV_DIR/lib, ICONV_SHARED_LIBADD)
-    AC_CHECK_LIB(iconv, libiconv_open, [
+  if test -f $ICONV_DIR/lib/lib${iconv_lib_name}.a ||
+     test -f $ICONV_DIR/lib/lib${iconv_lib_name}.$SHLIB_SUFFIX_NAME
+  then
+    PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, ICONV_SHARED_LIBADD)
+    AC_CHECK_LIB($iconv_lib_name, libiconv_open, [
        AC_DEFINE(HAVE_ICONV, 1, [ ])
        AC_DEFINE(HAVE_LIBICONV, 1, [ ])
     ])
   else
     AC_CHECK_LIB(c, iconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ]))
   fi
-
+  
   PHP_ADD_INCLUDE($ICONV_DIR/include)
   PHP_EXTENSION(iconv, $ext_shared)
   PHP_SUBST(ICONV_SHARED_LIBADD)