Simplify this and fix bug: #11654

diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index cbdec258f0fcca843e3fcf4645581c3a9c70d661..b1650a040f33a0024b0166cf61e15ce9d88b207c 100644 (file)
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -6,33 +6,22 @@ PHP_ARG_WITH(iconv, for iconv support,
 
 if test "$PHP_ICONV" != "no"; then
 
-  if test -r $PHP_ICONV/include/iconv.h; then
-    ICONV_DIR=$PHP_ICONV
-  else
-    AC_MSG_CHECKING(for iconv in default path)
-    for i in /usr/local /usr; do
-      if test -r $i/include/iconv.h; then
-        ICONV_DIR=$i
-        AC_MSG_RESULT(found in $i)
-      fi
-    done
-  fi
+  for i in /usr /usr/local $PHP_ICONV; do
+    test -r $i/include/iconv.h && ICONV_DIR=$i
+  done
 
   if test -z "$ICONV_DIR"; then
-    AC_MSG_RESULT(not found)
-    AC_MSG_ERROR(Please reinstall the iconv library)
+    AC_MSG_ERROR(Please reinstall the iconv library.)
   fi
   
-  PHP_ADD_INCLUDE($ICONV_DIR/include)
-
-  PHP_SUBST(ICONV_SHARED_LIBADD)
-
-  if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.so ; then
+  if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.s? ; then
     PHP_ADD_LIBRARY_WITH_PATH(iconv, $ICONV_DIR/lib, ICONV_SHARED_LIBADD)
-    AC_CHECK_LIB(iconv, iconv_open, AC_DEFINE(HAVE_ICONV, 1, [ ]))
+    AC_CHECK_LIB(iconv, libiconv_open, AC_DEFINE(HAVE_ICONV, 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)
 fi