diff --git a/configure.ac b/configure.ac
index 36f9f554..4d91ed34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,13 +196,13 @@ fi
 #
 # Support for iconv, check libc first.
 #
-AC_CHECK_FUNC(iconv_open,result=yes,
-  AC_SEARCH_LIBS(iconv_open,iconv,result=yes,result=no)
+AC_CHECK_HEADERS(iconv.h)
+AC_CHECK_FUNC(iconv_open,,
+  AC_SEARCH_LIBS(iconv_open, iconv)
 #  AC_CHECK_LIB(iconv,iconv_open,result=yes,result=no)
-  if test "$result" = "yes"; then
+#  if test "$result" = "yes"; then
 #    LIBS="$LIBS -liconv"
-    AC_CHECK_HEADERS(iconv.h)
-  fi
+#  fi
 )