--- configure.in.orig	Tue Mar  6 00:03:05 2001
+++ configure.in	Tue Mar  6 00:03:19 2001
@@ -417,14 +417,14 @@
     [ mutt_cv_func_iconv=no
       mutt_cv_lib_iconv=no
       AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
 	[iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);],
 	mutt_cv_func_iconv=yes)
       if test "$mutt_cv_func_iconv" = no; then
 	mutt_save_LIBS="$LIBS"
-	LIBS="$LIBS -liconv"
+	LIBS="$LIBS -lgiconv"
 	AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
+#include <giconv.h>],
 	  [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);],
 	  mutt_cv_lib_iconv=yes
 	  mutt_cv_func_iconv=yes)
@@ -435,7 +435,7 @@
   AC_MSG_ERROR(Unable to find iconv library)
 fi
 if test "$mutt_cv_lib_iconv" = yes; then
-  LIBICONV="-liconv"
+  LIBICONV="-lgiconv"
 fi
 AC_DEFINE(HAVE_ICONV)
 
@@ -448,7 +448,7 @@
 	mutt_save_LIBS="$LIBS"
 	LIBS="$LIBS $LIBICONV"
 	AC_TRY_RUN([
-#include <iconv.h>
+#include <giconv.h>
 int main()
 {
   iconv_t cd;
@@ -479,7 +479,7 @@
 	mutt_save_LIBS="$LIBS"
 	LIBS="$LIBS $LIBICONV"
 	AC_TRY_RUN([
-#include <iconv.h>
+#include <giconv.h>
 #include <string.h>
 int main()
 {