diff --git a/configure b/configure
index fad3d6d8..97a6ebec 100755
--- a/configure
+++ b/configure
@@ -5884,13 +5884,12 @@ echo "${ECHO_T}$ac_cv_func_iconv_open" >&6; }
 if test $ac_cv_func_iconv_open = yes; then
   :
 else
-  { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
-echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
+  { echo "$as_me:$LINENO: checking for library containing iconv_open" >&5
+echo $ECHO_N "checking for library containing iconv_open... $ECHO_C" >&6; }
+if test "${ac_cv_search_iconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5913,7 +5912,14 @@ return iconv_open ();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+for ac_lib in '' iconv; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -5931,29 +5937,40 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_iconv_iconv_open=yes
+  ac_cv_search_iconv_open=$ac_res
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_iconv_iconv_open=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+      conftest$ac_exeext
+  if test "${ac_cv_search_iconv_open+set}" = set; then
+  break
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
-echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6; }
-if test $ac_cv_lib_iconv_iconv_open = yes; then
-  result=yes
+done
+if test "${ac_cv_search_iconv_open+set}" = set; then
+  :
 else
-  result=no
+  ac_cv_search_iconv_open=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_iconv_open" >&5
+echo "${ECHO_T}$ac_cv_search_iconv_open" >&6; }
+ac_res=$ac_cv_search_iconv_open
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
 fi
 
-  if test "$result" = "yes"; then
-    LIBS="$LIBS -liconv"
-  fi
+#  AC_CHECK_LIB(iconv,iconv_open,result=yes,result=no)
+#  if test "$result" = "yes"; then
+#    LIBS="$LIBS -liconv"
+#  fi
 
 fi
 
diff --git a/configure.ac b/configure.ac
index 7faed209..36f9f554 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,11 +196,12 @@ fi
 #
 # Support for iconv, check libc first.
 #
-AC_CHECK_HEADERS(iconv.h)
-AC_CHECK_FUNC(iconv_open,,
-  AC_CHECK_LIB(iconv,iconv_open,result=yes,result=no)
+AC_CHECK_FUNC(iconv_open,result=yes,
+  AC_SEARCH_LIBS(iconv_open,iconv,result=yes,result=no)
+#  AC_CHECK_LIB(iconv,iconv_open,result=yes,result=no)
   if test "$result" = "yes"; then
-    LIBS="$LIBS -liconv"
+#    LIBS="$LIBS -liconv"
+    AC_CHECK_HEADERS(iconv.h)
   fi
 )