--- configure.orig	Thu Jan 18 08:27:41 2001
+++ configure	Mon Jan 29 23:54:52 2001
@@ -4900,9 +4900,9 @@
 save_CFLAGS="$CFLAGS"
 save_LDFLAGS="$LDFLAGS"
 CFLAGS="$CFLAGS $ICONV_CFLAGS"
-LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
-echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:4906: checking for iconv in -liconv" >&5
+LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
+echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
+echo "configure:4906: checking for iconv in -lgiconv" >&5
 if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4910,7 +4910,7 @@
 #line 4911 "configure"
 #include "confdefs.h"
 
-#include <iconv.h>
+#include <giconv.h>
 
 int main() {
 
@@ -4933,7 +4933,7 @@
 
 echo "$ac_t""$ac_cv_libiconv" 1>&6
 if test $ac_cv_libiconv = yes; then
-	ICONV_LIBS="$ICONV_LIBS -liconv"
+	ICONV_LIBS="$ICONV_LIBS -lgiconv"
 	have_iconv=yes
 else
 	CFLAGS="$save_CFLAGS"
@@ -5059,7 +5059,7 @@
 #line 5060 "configure"
 #include "confdefs.h"
 
-#include <iconv.h>
+#include <giconv.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_GNU_GET_LIBC_VERSION